From 3ea92ced4a87fe4b7ad065fab87a51997ed5a1e4 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 5 Dec 2012 20:01:24 +0300 Subject: [PATCH] --- yaml --- r: 336231 b: refs/heads/master c: 27d7c2a006a81c04fab00b8cd81b99af3b32738d h: refs/heads/master i: 336229: eb6fa982638478357265aa611081fd0d998eb445 336227: 94f224e121bd96102e18a186b69fd5178cc90225 336223: 70798649a1db878183b772b50f4cf8a830823dfa v: v3 --- [refs] | 2 +- trunk/fs/buffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 34f22d434da3..9170f636b96c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df2fc246c8ee8b6067af1fa55d3bc23107457f61 +refs/heads/master: 27d7c2a006a81c04fab00b8cd81b99af3b32738d diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c index c4e11390a44c..ec0aca8ba6bf 100644 --- a/trunk/fs/buffer.c +++ b/trunk/fs/buffer.c @@ -2935,7 +2935,7 @@ static void guard_bh_eod(int rw, struct bio *bio, struct buffer_head *bh) bio->bi_io_vec[0].bv_len = bytes; /* ..and clear the end of the buffer for reads */ - if (rw & READ) { + if ((rw & RW_MASK) == READ) { void *kaddr = kmap_atomic(bh->b_page); memset(kaddr + bh_offset(bh) + bytes, 0, bh->b_size - bytes); kunmap_atomic(kaddr);