From d2d76c33b6553ac3351e896efe9a6134370a108c Mon Sep 17 00:00:00 2001
From: Asias He <asias@redhat.com>
Date: Wed, 24 Apr 2013 19:38:11 -0700
Subject: [PATCH] --- yaml --- r: 367355 b: refs/heads/master c:
 0463a3fefda4cf0591edc685d4fb215a33315e01 h: refs/heads/master i:   367353:
 e6418edd75e6497b83bad55c0fdfd94a538e64fe   367351:
 1f83bdda9b6d11d7dfb95708acedb21b7a0cef0e v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/target/target_core_file.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f6cc678e240b..94871292924d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86d7182985d25900929adce14fffd729cc8c6fb8
+refs/heads/master: 0463a3fefda4cf0591edc685d4fb215a33315e01
diff --git a/trunk/drivers/target/target_core_file.c b/trunk/drivers/target/target_core_file.c
index 9063c31df9e1..58ed683e04ae 100644
--- a/trunk/drivers/target/target_core_file.c
+++ b/trunk/drivers/target/target_core_file.c
@@ -192,6 +192,9 @@ static int fd_configure_device(struct se_device *dev)
 		 * the smaller WRITE_SAME(10) only has a two-byte block count.
 		 */
 		dev->dev_attrib.max_write_same_len = 0xFFFF;
+
+		if (blk_queue_nonrot(q))
+			dev->dev_attrib.is_nonrot = 1;
 	} else {
 		if (!(fd_dev->fbd_flags & FBDF_HAS_SIZE)) {
 			pr_err("FILEIO: Missing fd_dev_size="