---

yaml --- r: 110443 b: refs/heads/master c: a9c701e h: refs/heads/master i: 110441: 13b65b0 110439: 2c6f382 v: v3
git-mirror · Oct 9, 2008 · 6800dbf · 6800dbf
1 parent dc760c6
commit 6800dbf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a67f63b3233ff28e753854fe27891c44f8588ae
+refs/heads/master: a9c701e594669dd49fed448c27c64f20cfacc8a7
diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c
@@ -1490,10 +1490,7 @@ void submit_bio(int rw, struct bio *bio)
 	 * If it's a regular read/write or a barrier with data attached,
 	 * go through the normal accounting stuff before submission.
 	 */
-	if (!bio_empty_barrier(bio)) {
-
-		BIO_BUG_ON(!bio->bi_size);
-		BIO_BUG_ON(!bio->bi_io_vec);
+	if (bio_has_data(bio)) {
 
 		if (rw & WRITE) {
 			count_vm_events(PGPGOUT, count);

diff --git a/trunk/include/linux/bio.h b/trunk/include/linux/bio.h
@@ -185,7 +185,7 @@ struct bio {
 #define bio_failfast(bio)	((bio)->bi_rw & (1 << BIO_RW_FAILFAST))
 #define bio_rw_ahead(bio)	((bio)->bi_rw & (1 << BIO_RW_AHEAD))
 #define bio_rw_meta(bio)	((bio)->bi_rw & (1 << BIO_RW_META))
-#define bio_empty_barrier(bio)	(bio_barrier(bio) && !(bio)->bi_size)
+#define bio_empty_barrier(bio)	(bio_barrier(bio) && !bio_has_data(bio))
 
 static inline unsigned int bio_cur_sectors(struct bio *bio)
 {