From a32a0e56ed9268fb9a6507c7e4d212a3928ecded Mon Sep 17 00:00:00 2001
From: Nicholas Bellinger <nab@linux-iscsi.org>
Date: Sat, 11 May 2013 16:16:49 -0700
Subject: [PATCH] --- yaml --- r: 375655 b: refs/heads/master c:
 52c07423a819091b0fe9abbf26977098b996f85b h: refs/heads/master i:   375653:
 7f4d3578895d0f779375dd86c45cc5dad48d0d68   375651:
 5c5e9bf69a115198cc0ee1d2fcf9dc5565cd6fc2   375647:
 61a384ef018eeb980e173032631d0db442dee38c v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/target/target_core_rd.c | 21 ++++++++++++++++++---
 trunk/drivers/target/target_core_rd.h |  1 +
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 08ba74034301..195ef565afce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3eccfdb01da58fbd0f789ae6ca61cee3769e26de
+refs/heads/master: 52c07423a819091b0fe9abbf26977098b996f85b
diff --git a/trunk/drivers/target/target_core_rd.c b/trunk/drivers/target/target_core_rd.c
index e0b3c379aa14..0921a64b5550 100644
--- a/trunk/drivers/target/target_core_rd.c
+++ b/trunk/drivers/target/target_core_rd.c
@@ -291,6 +291,11 @@ rd_execute_rw(struct se_cmd *cmd)
 	u32 src_len;
 	u64 tmp;
 
+	if (dev->rd_flags & RDF_NULLIO) {
+		target_complete_cmd(cmd, SAM_STAT_GOOD);
+		return 0;
+	}
+
 	tmp = cmd->t_task_lba * se_dev->dev_attrib.block_size;
 	rd_offset = do_div(tmp, PAGE_SIZE);
 	rd_page = tmp;
@@ -373,11 +378,12 @@ rd_execute_rw(struct se_cmd *cmd)
 }
 
 enum {
-	Opt_rd_pages, Opt_err
+	Opt_rd_pages, Opt_rd_nullio, Opt_err
 };
 
 static match_table_t tokens = {
 	{Opt_rd_pages, "rd_pages=%d"},
+	{Opt_rd_nullio, "rd_nullio=%d"},
 	{Opt_err, NULL}
 };
 
@@ -408,6 +414,14 @@ static ssize_t rd_set_configfs_dev_params(struct se_device *dev,
 				" Count: %u\n", rd_dev->rd_page_count);
 			rd_dev->rd_flags |= RDF_HAS_PAGE_COUNT;
 			break;
+		case Opt_rd_nullio:
+			match_int(args, &arg);
+			if (arg != 1)
+				break;
+
+			pr_debug("RAMDISK: Setting NULLIO flag: %d\n", arg);
+			rd_dev->rd_flags |= RDF_NULLIO;
+			break;
 		default:
 			break;
 		}
@@ -424,8 +438,9 @@ static ssize_t rd_show_configfs_dev_params(struct se_device *dev, char *b)
 	ssize_t bl = sprintf(b, "TCM RamDisk ID: %u  RamDisk Makeup: rd_mcp\n",
 			rd_dev->rd_dev_id);
 	bl += sprintf(b + bl, "        PAGES/PAGE_SIZE: %u*%lu"
-			"  SG_table_count: %u\n", rd_dev->rd_page_count,
-			PAGE_SIZE, rd_dev->sg_table_count);
+			"  SG_table_count: %u  nullio: %d\n", rd_dev->rd_page_count,
+			PAGE_SIZE, rd_dev->sg_table_count,
+			!!(rd_dev->rd_flags & RDF_NULLIO));
 	return bl;
 }
 
diff --git a/trunk/drivers/target/target_core_rd.h b/trunk/drivers/target/target_core_rd.h
index 933b38b6e563..1789d1e14395 100644
--- a/trunk/drivers/target/target_core_rd.h
+++ b/trunk/drivers/target/target_core_rd.h
@@ -22,6 +22,7 @@ struct rd_dev_sg_table {
 } ____cacheline_aligned;
 
 #define RDF_HAS_PAGE_COUNT	0x01
+#define RDF_NULLIO		0x02
 
 struct rd_dev {
 	struct se_device dev;