diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-14 11:57:05 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-14 11:57:05 -0800 |
| commit | c25ecd0a21d5e08160cb5cc984f9e2b8ee347443 (patch) | |
| tree | 0e4dcacf1bf603f259b8d27445a10e60fa8d00d7 /drivers/block/aoe | |
| parent | 190683a9d5457e6d962c232ffbecac3ab158dddd (diff) | |
| parent | 9457b24a0955bbdd2e89220a75de69fe09501bba (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/block/aoe')
| -rw-r--r-- | drivers/block/aoe/aoeblk.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c index 541e18879965..528f6318ded1 100644 --- 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(); |