File iscsitarget-2.6.29.patch of Package iscsitarget

Overview Repositories Revisions Requests Users Attributes Meta

File iscsitarget-2.6.29.patch of Package iscsitarget

--- kernel/block-io.c
+++ kernel/block-io.c
@@ -13,6 +13,7 @@
 #include <linux/blkdev.h>
 #include <linux/parser.h>
 #include <linux/buffer_head.h>
+#include <linux/fs.h>
 
 #include "iscsi.h"
 #include "iscsi_dbg.h"
@@ -154,14 +155,16 @@
 {
 	struct blockio_data *bio_data = volume->private;
 	struct block_device *bdev;
-	int flags = LUReadonly(volume) ? MS_RDONLY : 0;
 	int err = 0;
+        fmode_t mode = FMODE_READ;
+	if (!LUReadonly(volume))
+		mode |= FMODE_WRITE;
 
 	bio_data->path = kstrdup(path, GFP_KERNEL);
 	if (!bio_data->path)
 		return -ENOMEM;
 
-	bdev = open_bdev_excl(path, flags, THIS_MODULE);
+	bdev = open_bdev_exclusive(path, mode, THIS_MODULE);
 	if (IS_ERR(bdev)) {
 		err = PTR_ERR(bdev);
 		eprintk("Can't open device %s, error %d\n", path, err);
@@ -323,9 +326,12 @@
 blockio_detach(struct iet_volume *volume)
 {
 	struct blockio_data *bio_data = volume->private;
+        fmode_t mode = FMODE_READ;
+	if (!LUReadonly(volume))
+		mode |= FMODE_WRITE;
 
 	if (bio_data->bdev)
-		close_bdev_excl(bio_data->bdev);
+		close_bdev_exclusive(bio_data->bdev, mode);
 	kfree(bio_data->path);
 
 	kfree(volume->private);
--- kernel/conn.c
+++ kernel/conn.c
@@ -43,12 +43,12 @@
 		switch (sk->sk_family) {
 		case AF_INET:
 			snprintf(buf, sizeof(buf),
-				 "%u.%u.%u.%u", NIPQUAD(inet_sk(sk)->daddr));
+				 "%pI4", &inet_sk(sk)->daddr);
 			break;
 		case AF_INET6:
 			snprintf(buf, sizeof(buf),
-				 "[%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]",
-				 NIP6(inet6_sk(sk)->daddr));
+				 "[%pI6]",
+				 &inet6_sk(sk)->daddr);
 			break;
 		default:
 			break;

Places

File iscsitarget-2.6.29.patch of Package iscsitarget

Places