diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-12-05 20:01:24 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-05 10:32:59 -0800 |
| commit | 27d7c2a006a81c04fab00b8cd81b99af3b32738d (patch) | |
| tree | d04b7860b79d70b5c1ebedc964ffa1cc8fee261e | |
| parent | df2fc246c8ee8b6067af1fa55d3bc23107457f61 (diff) | |
| download | op-kernel-dev-27d7c2a006a81c04fab00b8cd81b99af3b32738d.zip op-kernel-dev-27d7c2a006a81c04fab00b8cd81b99af3b32738d.tar.gz | |
vfs: clear to the end of the buffer on partial buffer reads
READ is zero so the "rw & READ" test is always false. The intended test
was "((rw & RW_MASK) == READ)".
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index c4e1139..ec0aca8 100644 --- a/fs/buffer.c +++ b/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); |
