From 44970fd2b3baeece76e8c59e7f007b958ccb32f3 Mon Sep 17 00:00:00 2001
From: Roland Dreier <roland@purestorage.com>
Date: Wed, 14 Mar 2012 10:12:03 -0700
Subject: [PATCH] --- yaml --- r: 292863 b: refs/heads/master c:
 1f6fa8f8179dd66345d59f067f2a48a86095c499 h: refs/heads/master i:   292861:
 45989304e9553bc55f4f3dec7addedabc45518eb   292859:
 e3b1dc55fb9d570588d492e05c9c094c06fd1664   292855:
 2147c7cbac3ecf3cf15cc2cec7f682a33f1ce6e4   292847:
 ffbed57977988abfc8c323c152a36f3cffd0e0f7   292831:
 91412c201b57f34cb2e5ede753f5f90ddf826d2b   292799:
 84fcff607a8ab2c71fed02d8132175fc95e884a3   292735:
 878d44e9de26729a827fdfe5e8b52c5bc80b9726   292607:
 e60f2bab68f4e9d74d5650fdf6520cd34cc996cb   292351:
 f68dd39a2dc4120ee80b5f2280f47d3ad6d69086   291839:
 78f3b13581fbbb2fb5b84a1bd8d36e9ee2a8cea2   290815:
 ef80caba204a6a27732748ce85563df94c39529e v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/target/target_core_cdb.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 0c2dd737b2a5..7f7b7815e149 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9765b1f327951e643a97f43924d1fbeb4e90ffba
+refs/heads/master: 1f6fa8f8179dd66345d59f067f2a48a86095c499
diff --git a/trunk/drivers/target/target_core_cdb.c b/trunk/drivers/target/target_core_cdb.c
index 41ca2d43377b..30a67707036f 100644
--- a/trunk/drivers/target/target_core_cdb.c
+++ b/trunk/drivers/target/target_core_cdb.c
@@ -694,11 +694,6 @@ int target_emulate_readcapacity(struct se_task *task)
 	buf[5] = (dev->se_sub_dev->se_dev_attrib.block_size >> 16) & 0xff;
 	buf[6] = (dev->se_sub_dev->se_dev_attrib.block_size >> 8) & 0xff;
 	buf[7] = dev->se_sub_dev->se_dev_attrib.block_size & 0xff;
-	/*
-	 * Set max 32-bit blocks to signal SERVICE ACTION READ_CAPACITY_16
-	*/
-	if (dev->se_sub_dev->se_dev_attrib.emulate_tpu || dev->se_sub_dev->se_dev_attrib.emulate_tpws)
-		put_unaligned_be32(0xFFFFFFFF, &buf[0]);
 
 	transport_kunmap_data_sg(cmd);