summaryrefslogtreecommitdiffstats
path: root/drivers/block/loop.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-01 18:58:18 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-01 18:58:18 +0100
commit6e1bd1ab1d9ab8e83cdc940df82fbf8418e2593f (patch)
treef1324a39f155375221ed88db0626f61b75c51db6 /drivers/block/loop.c
parentASoC: Store DC offset correction for wm_hubs devices in class W mode (diff)
parentASoC: Include cx20442 to SND_SOC_ALL_CODECS (diff)
downloadlinux-6e1bd1ab1d9ab8e83cdc940df82fbf8418e2593f.tar.xz
linux-6e1bd1ab1d9ab8e83cdc940df82fbf8418e2593f.zip
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'drivers/block/loop.c')
-rw-r--r--drivers/block/loop.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index f3c636d23718..91797bbbe702 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -477,7 +477,7 @@ static int do_bio_filebacked(struct loop_device *lo, struct bio *bio)
pos = ((loff_t) bio->bi_sector << 9) + lo->lo_offset;
if (bio_rw(bio) == WRITE) {
- bool barrier = (bio->bi_rw & REQ_HARDBARRIER);
+ bool barrier = !!(bio->bi_rw & REQ_HARDBARRIER);
struct file *file = lo->lo_backing_file;
if (barrier) {