Author: lkundrak Update of /cvs/free/rpms/iscsitarget-kmod/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv14555 Modified Files: .cvsignore iscsitarget-kmod.spec sources Added Files: iscsitarget-0.4.17-2.6.29.patch Removed Files: iscsitarget-0.4.15-2.6.28.patch iscsitarget-0.4.15-svn147.patch iscsitarget-0.4.15-types.h.patch Log Message: Bump upstream, build for 2.6.29 iscsitarget-0.4.17-2.6.29.patch: --- NEW FILE iscsitarget-0.4.17-2.6.29.patch --- Fix build with 2.6.29. Addresses these changes: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit... http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit... Lubomir Rintel <lkundrak(a)v3.sk&gt; Index: kernel/block-io.c =================================================================== --- kernel/block-io.c (revision 198) +++ kernel/block-io.c (working copy) @@ -13,6 +13,7 @@ #include <linux/blkdev.h> #include <linux/parser.h> #include <linux/buffer_head.h> +#include <linux/version.h> #include "iscsi.h" #include "iscsi_dbg.h" @@ -154,14 +155,22 @@ { struct blockio_data *bio_data = volume->private; struct block_device *bdev; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) int flags = LUReadonly(volume) ? MS_RDONLY : 0; +#else + fmode_t flags = LUReadonly(volume) ? FMODE_READ : (FMODE_READ | FMODE_WRITE); +#endif int err = 0; bio_data->path = kstrdup(path, GFP_KERNEL); if (!bio_data->path) return -ENOMEM; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) bdev = open_bdev_excl(path, flags, THIS_MODULE); +#else + bdev = open_bdev_exclusive(path, flags, THIS_MODULE); +#endif if (IS_ERR(bdev)) { err = PTR_ERR(bdev); eprintk("Can't open device %s, error %d\n", path, err); @@ -324,8 +333,17 @@ { struct blockio_data *bio_data = volume->private; - if (bio_data->bdev) + if (bio_data->bdev) { +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) close_bdev_excl(bio_data->bdev); +#else + if (LUReadonly(volume)) { + close_bdev_exclusive(bio_data->bdev, FMODE_READ); + } else { + close_bdev_exclusive(bio_data->bdev, FMODE_READ|FMODE_WRITE); + } +#endif + } kfree(bio_data->path); kfree(volume->private); Index: kernel/conn.c =================================================================== --- kernel/conn.c (revision 198) +++ kernel/conn.c (working copy) @@ -46,9 +46,13 @@ "%u.%u.%u.%u", NIPQUAD(inet_sk(sk)->daddr)); break; case AF_INET6: +#ifdef NIP6 snprintf(buf, sizeof(buf), "[%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]", NIP6(inet6_sk(sk)->daddr)); +#else + snprintf(buf, sizeof(buf), "[%p6]", &inet6_sk(sk)->daddr); +#endif break; default: break; Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/iscsitarget-kmod/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Oct 2008 14:22:10 -0000 1.2 +++ .cvsignore 5 Jan 2009 16:13:05 -0000 1.3 @@ -1 +1 @@ -iscsitarget-0.4.15.tar.gz +iscsitarget-0.4.17.tar.gz Index: iscsitarget-kmod.spec =================================================================== RCS file: /cvs/free/rpms/iscsitarget-kmod/devel/iscsitarget-kmod.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- iscsitarget-kmod.spec 4 Jan 2009 09:53:56 -0000 1.16 +++ iscsitarget-kmod.spec 5 Jan 2009 16:13:05 -0000 1.17 @@ -5,12 +5,9 @@ # a new akmod package will only get build when a new one is actually needed %define buildforkernels newest -# Release code won't build for newer kernels -%define patchlevel svn147 - Name: iscsitarget-kmod -Version: 0.4.15 -Release: 42.%{patchlevel}%{?dist}.3 +Version: 0.4.17 +Release: 1%{?dist} Epoch: 1 Summary: iscsitarget kernel modules @@ -18,12 +15,7 @@ License: GPLv2 URL: http://sourceforge.net/projects/iscsitarget/ Source0: http://dl.sf.net/iscsitarget/iscsitarget-%{version}.tar.gz -# This was created with: -# svn diff http://svn.berlios.de/svnroot/repos/iscsitarget/tags/0.4.15/ \ -# http://svn.berlios.de/svnroot/repos/iscsitarget/trunk/@147 -Patch0: iscsitarget-0.4.15-%{patchlevel}.patch -Patch1: iscsitarget-0.4.15-types.h.patch -Patch2: iscsitarget-0.4.15-2.6.28.patch +Patch0: iscsitarget-0.4.17-2.6.29.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # needed for plague to make sure it builds for i586 and i686 @@ -48,11 +40,7 @@ # go %setup -q -c -T -a 0 pushd iscsitarget-%{version} -%patch0 -p0 -%patch1 -p1 -%patch2 -p1 -#%patch0 -p0 -b .svn142 -# -b creates empty mode 000 file that cannot be copied with cp -a +%patch0 -p0 -b .2.6.29 popd for kernel_version in %{?kernel_versions}; do @@ -83,6 +71,10 @@ %changelog +* Mon Jan 05 2009 Lubomir Rintel <lkundrak(a)v3.sk&gt; - 1:0.4.17-1 +- Bump to latest upstream version +- Fix for 2.6.29 + * Sun Jan 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:0.4.15-42.svn147.3 - rebuild for latest Fedora kernel; Index: sources =================================================================== RCS file: /cvs/free/rpms/iscsitarget-kmod/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Oct 2008 14:22:10 -0000 1.2 +++ sources 5 Jan 2009 16:13:05 -0000 1.3 @@ -1 +1 @@ -81390e388d87e3cc17383ef5f4322c28 iscsitarget-0.4.15.tar.gz +e79b437695fc50e7d054631855a16b1b iscsitarget-0.4.17.tar.gz --- iscsitarget-0.4.15-2.6.28.patch DELETED --- --- iscsitarget-0.4.15-svn147.patch DELETED --- --- iscsitarget-0.4.15-types.h.patch DELETED ---