Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=51fd77bd9f512ab6cc9df0733ba1caaab89eb957
Commit: 51fd77bd9f512ab6cc9df0733ba1caaab89eb957
Parent: 5ec140e600b7d6624c657f008833f0e71bd5ef48
Author: Jens Axboe <[EMAIL PROTECTED]>
AuthorDate: Fri Nov 2 08:49:08 2007 +0100
Committer: Jens Axboe <[EMAIL PROTECTED]>
CommitDate: Fri Nov 2 08:49:08 2007 +0100
[BLOCK] Don't allow empty barriers to be passed down to queues that don't
grok them
Signed-off-by: Jens Axboe <[EMAIL PROTECTED]>
---
block/ll_rw_blk.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index 56f2646..3e4e8bf 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -3221,6 +3221,7 @@ static inline void __generic_make_request(struct bio *bio)
sector_t old_sector;
int ret, nr_sectors = bio_sectors(bio);
dev_t old_dev;
+ int err = -EIO;
might_sleep();
@@ -3248,7 +3249,7 @@ static inline void __generic_make_request(struct bio *bio)
bdevname(bio->bi_bdev, b),
(long long) bio->bi_sector);
end_io:
- bio_endio(bio, -EIO);
+ bio_endio(bio, err);
break;
}
@@ -3283,6 +3284,10 @@ end_io:
if (bio_check_eod(bio, nr_sectors))
goto end_io;
+ if (bio_empty_barrier(bio) && !q->prepare_flush_fn) {
+ err = -EOPNOTSUPP;
+ goto end_io;
+ }
ret = q->make_request_fn(q, bio);
} while (ret);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
