UBUNTU: ubuntu: iscsitarget -- version 1.4.20.2

Update iscsitarget to the latest stable version (v1.4.20.2) from
sourceforge.

ExternalDriver: iscsi_trgt
Url: http://sourceforge.net/projects/iscsitarget/files/
Version: 1.4.20.2

Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

9 files changed, 40 insertions, 10 deletions

diff --git a/ubuntu/iscsitarget/BOM b/ubuntu/iscsitarget/BOM
index 0fde30cd819..40751ae4450 100644
--- a/ubuntu/iscsitarget/BOM
+++ b/ubuntu/iscsitarget/BOM
@@ -1,2 +1,2 @@
-Downloaded from:	svn://svn.berlios.de/iscsitarget/trunk
-Current Version:	1.4.20.1
+Downloaded from:	http://sourceforge.net/projects/iscsitarget/files/
+Current Version:	1.4.20.2
diff --git a/ubuntu/iscsitarget/block-io.c b/ubuntu/iscsitarget/block-io.c
index 4de1d2005e4..c812abfc16c 100644
--- a/ubuntu/iscsitarget/block-io.c
+++ b/ubuntu/iscsitarget/block-io.c
@@ -282,8 +282,8 @@ blockio_attach(struct iet_volume *volume, char *args)
 		/* see Documentation/ABI/testing/sysfs-block */
 		unsigned bsz = bdev_logical_block_size(bio_data->bdev);
 		if (!volume->blk_shift)
-			volume->blk_shift = ilog2(bsz);
-		else if (volume->blk_shift < ilog2(bsz)) {
+			volume->blk_shift = blksize_bits(bsz);
+		else if (volume->blk_shift < blksize_bits(bsz)) {
 			eprintk("Specified block size (%u) smaller than "
 				"device %s logical block size (%u)\n",
 				(1 << volume->blk_shift), bio_data->path, bsz);
diff --git a/ubuntu/iscsitarget/compat.h b/ubuntu/iscsitarget/compat.h
new file mode 100644
index 00000000000..631a49c331f
--- /dev/null
+++ b/ubuntu/iscsitarget/compat.h
@@ -0,0 +1,30 @@
+/*
+ * Kernel compatibility routines
+ *
+ * Copyright (C) 2008 Ross Walker <rswwalker at gmail dot com>
+ *
+ * Released under the terms of the GNU GPL v2.0.
+ */
+
+#ifndef __IET_COMPAT_H__
+#define __IET_COMPAT_H__
+
+#include <linux/version.h>
+
+#ifndef DECLARE_COMPLETION_ONSTACK
+#define DECLARE_COMPLETION_ONSTACK(work) DECLARE_COMPLETION(work)
+#endif
+
+#ifndef is_power_of_2
+#define is_power_of_2(n) (n != 0 && ((n & (n - 1)) == 0))
+#endif
+
+#ifndef log2
+#define log2(n) ((sizeof(n) <= 4) ? (fls(n) - 1) : (fls64(n) - 1))
+#endif
+
+#ifndef roundup_pow_of_two
+#define roundup_pow_of_two(n) (1UL << fls_long(n - 1))
+#endif
+
+#endif	/* __IET_COMPAT_H__ */
diff --git a/ubuntu/iscsitarget/file-io.c b/ubuntu/iscsitarget/file-io.c
index 38951a938c8..a050fccda03 100644
--- a/ubuntu/iscsitarget/file-io.c
+++ b/ubuntu/iscsitarget/file-io.c
@@ -232,7 +232,7 @@ static int fileio_attach(struct iet_volume *lu, char *args)
 	}
 
 	if (!lu->blk_shift)
-		lu->blk_shift = ilog2(IET_DEF_BLOCK_SIZE);
+		lu->blk_shift = blksize_bits(IET_DEF_BLOCK_SIZE);
 
 	lu->blk_cnt = inode->i_size >> lu->blk_shift;
 
diff --git a/ubuntu/iscsitarget/include/iet_u.h b/ubuntu/iscsitarget/include/iet_u.h
index 174f0dc4cfa..6fdc7167cea 100644
--- a/ubuntu/iscsitarget/include/iet_u.h
+++ b/ubuntu/iscsitarget/include/iet_u.h
@@ -1,7 +1,7 @@
 #ifndef _IET_U_H
 #define _IET_U_H
 
-#define IET_VERSION_STRING	"1.4.20.1"
+#define IET_VERSION_STRING	"1.4.20.2"
 
 /* The maximum length of 223 bytes in the RFC. */
 #define ISCSI_NAME_LEN	256
diff --git a/ubuntu/iscsitarget/iscsi.h b/ubuntu/iscsitarget/iscsi.h
index e9d37a4751e..9ded23a995c 100644
--- a/ubuntu/iscsitarget/iscsi.h
+++ b/ubuntu/iscsitarget/iscsi.h
@@ -19,6 +19,7 @@
 
 #include "iscsi_hdr.h"
 #include "iet_u.h"
+#include "compat.h"
 
 #define IET_SENSE_BUF_SIZE      18
 
diff --git a/ubuntu/iscsitarget/null-io.c b/ubuntu/iscsitarget/null-io.c
index f64b18c9a85..0b87507fbfa 100644
--- a/ubuntu/iscsitarget/null-io.c
+++ b/ubuntu/iscsitarget/null-io.c
@@ -78,7 +78,7 @@ static int nullio_attach(struct iet_volume *lu, char *args)
 	}
 
 	if (!lu->blk_shift)
-		lu->blk_shift = ilog2(IET_DEF_BLOCK_SIZE);
+		lu->blk_shift = blksize_bits(IET_DEF_BLOCK_SIZE);
 
 	/* defaults to 64 GiB */
 	if (!lu->blk_cnt)
diff --git a/ubuntu/iscsitarget/ua.c b/ubuntu/iscsitarget/ua.c
index c4ba4c20dee..97f1ba0e4dd 100644
--- a/ubuntu/iscsitarget/ua.c
+++ b/ubuntu/iscsitarget/ua.c
@@ -108,7 +108,7 @@ void ua_establish_for_session(struct iscsi_session *sess, u32 lun,
 			      u8 asc, u8 ascq)
 {
 	struct list_head *l = &sess->ua_hash[ua_hashfn(lun)];
-	struct ua_entry *ua = kmem_cache_alloc(ua_cache, GFP_KERNEL);
+	struct ua_entry *ua = kmem_cache_alloc(ua_cache, GFP_ATOMIC);
 	struct ua_entry *e;
 
 	if (!ua) {
diff --git a/ubuntu/iscsitarget/volume.c b/ubuntu/iscsitarget/volume.c
index 6abe16b6b5c..2c9a6984089 100644
--- a/ubuntu/iscsitarget/volume.c
+++ b/ubuntu/iscsitarget/volume.c
@@ -6,7 +6,6 @@
 
 #include <linux/types.h>
 #include <linux/parser.h>
-#include <linux/log2.h>
 
 #include "iscsi.h"
 #include "iscsi_dbg.h"
@@ -187,7 +186,7 @@ static int parse_volume_params(struct iet_volume *volume, char *params)
 			blk_sz = simple_strtoull(argp, NULL, 10);
 			if (is_power_of_2(blk_sz) &&
 			    512 <= blk_sz && blk_sz <= IET_MAX_BLOCK_SIZE)
-				volume->blk_shift = ilog2(blk_sz);
+				volume->blk_shift = blksize_bits(blk_sz);
 			else {
 				eprintk("invalid BlockSize=%u\n", blk_sz);
 				err = -EINVAL;