---

yaml --- r: 213181 b: refs/heads/master c: 1e87901 h: refs/heads/master i: 213179: cea167b v: v3
git-mirror · Sep 10, 2010 · fba25a8 · fba25a8
1 parent 447282a
commit fba25a8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fed947cb311e5aa51781d316cefca836352f6ce
+refs/heads/master: 1e87901e189c8f01750d67485009fe3827c691bf
diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c
@@ -1509,6 +1509,19 @@ static inline void __generic_make_request(struct bio *bio)
 		if (bio_check_eod(bio, nr_sectors))
 			goto end_io;
 
+		/*
+		 * Filter flush bio's early so that make_request based
+		 * drivers without flush support don't have to worry
+		 * about them.
+		 */
+		if ((bio->bi_rw & (REQ_FLUSH | REQ_FUA)) && !q->flush_flags) {
+			bio->bi_rw &= ~(REQ_FLUSH | REQ_FUA);
+			if (!nr_sectors) {
+				err = 0;
+				goto end_io;
+			}
+		}
+
 		if ((bio->bi_rw & REQ_DISCARD) &&
 		    (!blk_queue_discard(q) ||
 		     ((bio->bi_rw & REQ_SECURE) &&