Author: arekm Date: Sun Mar 27 19:03:06 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 16; builds with 2.6.38
---- Files affected:
packages/iscsitarget:
iscsitarget.spec (1.39 -> 1.40) , iscsitarget-2.6.38.patch (NONE -> 1.1)
(NEW)
---- Diffs:
================================================================
Index: packages/iscsitarget/iscsitarget.spec
diff -u packages/iscsitarget/iscsitarget.spec:1.39
packages/iscsitarget/iscsitarget.spec:1.40
--- packages/iscsitarget/iscsitarget.spec:1.39 Sun Mar 27 12:51:09 2011
+++ packages/iscsitarget/iscsitarget.spec Sun Mar 27 21:03:01 2011
@@ -6,7 +6,7 @@
%bcond_without userspace # don't build userspace module
%bcond_with verbose # verbose build (V=1)
#
-%define _rel 15
+%define _rel 16
Summary: iSCSI target - SCSI over IP
Summary(pl.UTF-8): iSCSI target - SCSI po IP
Name: iscsitarget
@@ -19,6 +19,7 @@
Source1: %{name}.init
Source2: %{name}.sysconfig
Patch0: iscsitarget-2.6.37.patch
+Patch1: iscsitarget-2.6.38.patch
URL: http://iscsitarget.sourceforge.net/
BuildRequires: rpmbuild(macros) >= 1.379
BuildRequires: openssl-devel
@@ -60,6 +61,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%if %{with kernel}
@@ -132,6 +134,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.40 2011/03/27 19:03:01 arekm
+- rel 16; builds with 2.6.38
+
Revision 1.39 2011/03/27 10:51:09 arekm
- release 15
================================================================
Index: packages/iscsitarget/iscsitarget-2.6.38.patch
diff -u /dev/null packages/iscsitarget/iscsitarget-2.6.38.patch:1.1
--- /dev/null Sun Mar 27 21:03:07 2011
+++ packages/iscsitarget/iscsitarget-2.6.38.patch Sun Mar 27 21:03:01 2011
@@ -0,0 +1,33 @@
+diff -urN iscsitarget-1.4.20.2.org/kernel/block-io.c
iscsitarget-1.4.20.2/kernel/block-io.c
+--- iscsitarget-1.4.20.2.org/kernel/block-io.c 2010-06-30 00:02:26.000000000
+0200
++++ iscsitarget-1.4.20.2/kernel/block-io.c 2011-03-27 21:00:32.361460295
+0200
+@@ -155,14 +155,14 @@
+ {
+ struct blockio_data *bio_data = volume->private;
+ struct block_device *bdev;
+- int flags = FMODE_READ | (LUReadonly(volume) ? 0 : FMODE_WRITE);
++ int flags = FMODE_EXCL | FMODE_READ | (LUReadonly(volume) ? 0 :
FMODE_WRITE);
+ int err = 0;
+
+ bio_data->path = kstrdup(path, GFP_KERNEL);
+ if (!bio_data->path)
+ return -ENOMEM;
+
+- bdev = open_bdev_exclusive(path, flags, THIS_MODULE);
++ bdev = blkdev_get_by_path(path, flags, THIS_MODULE);
+ if (IS_ERR(bdev)) {
+ err = PTR_ERR(bdev);
+ eprintk("Can't open device %s, error %d\n", path, err);
+@@ -250,10 +250,10 @@
+ blockio_detach(struct iet_volume *volume)
+ {
+ struct blockio_data *bio_data = volume->private;
+- int flags = FMODE_READ | (LUReadonly(volume) ? 0 : FMODE_WRITE);
++ int flags = FMODE_EXCL | FMODE_READ | (LUReadonly(volume) ? 0 :
FMODE_WRITE);
+
+ if (bio_data->bdev)
+- close_bdev_exclusive(bio_data->bdev, flags);
++ blkdev_put(bio_data->bdev, flags);
+ kfree(bio_data->path);
+
+ kfree(volume->private);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iscsitarget/iscsitarget.spec?r1=1.39&r2=1.40&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
