Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[karo-tx-linux.git] / drivers / block / osdblk.c

diff --git a/drivers/block/osdblk.c b/drivers/block/osdblk.c
index 72d62462433d0eac60e8e0253460c910abf44354..87311ebac0db4e5cc3f04fe0e255bf01d62aa730 100644 (file)
--- a/drivers/block/osdblk.c
+++ b/drivers/block/osdblk.c
@@ -310,8 +310,7 @@ static void osdblk_rq_fn(struct request_queue *q)
                        break;
 
                /* filter out block requests we don't understand */
-               if (rq->cmd_type != REQ_TYPE_FS &&
-                   !(rq->cmd_flags & REQ_HARDBARRIER)) {
+               if (rq->cmd_type != REQ_TYPE_FS) {
                        blk_end_request_all(rq, 0);
                        continue;
                }