git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
block
/
aoe
/
aoeblk.c
diff --git
a/drivers/block/aoe/aoeblk.c
b/drivers/block/aoe/aoeblk.c
index
541e188
..
528f631
100644
(file)
--- a/
drivers/block/aoe/aoeblk.c
+++ b/
drivers/block/aoe/aoeblk.c
@@
-180,9
+180,6
@@
aoeblk_make_request(struct request_queue *q, struct bio *bio)
BUG();
bio_endio(bio, -ENXIO);
return 0;
- } else if (bio->bi_rw & REQ_HARDBARRIER) {
- bio_endio(bio, -EOPNOTSUPP);
- return 0;
} else if (bio->bi_io_vec == NULL) {
printk(KERN_ERR "aoe: bi_io_vec is NULL\n");
BUG();