summaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2016-05-20 10:29:15 +1000
committerDave Chinner <david@fromorbit.com>2016-05-20 10:29:15 +1000
commit690a7871225b7f91f8fe13c465a79e183a61cfe3 (patch)
tree95a00b9016159369214982ee449f300768538503 /fs/xfs
parent0e51a8e191dbd9b9c7b7bb0a1c28d57cd2be8e6a (diff)
downloadlinux-stable-690a7871225b7f91f8fe13c465a79e183a61cfe3.tar.gz
linux-stable-690a7871225b7f91f8fe13c465a79e183a61cfe3.tar.bz2
linux-stable-690a7871225b7f91f8fe13c465a79e183a61cfe3.zip
xfs: fix warning in xfs_finish_page_writeback for non-debug builds
blockmask is unused if ASSERTs are disabled. Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/xfs_aops.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index b5f1c66bbb58..736461a861b1 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -94,15 +94,14 @@ xfs_finish_page_writeback(
struct bio_vec *bvec,
int error)
{
- unsigned int blockmask = (1 << inode->i_blkbits) - 1;
unsigned int end = bvec->bv_offset + bvec->bv_len - 1;
struct buffer_head *head, *bh;
unsigned int off = 0;
ASSERT(bvec->bv_offset < PAGE_SIZE);
- ASSERT((bvec->bv_offset & blockmask) == 0);
+ ASSERT((bvec->bv_offset & ((1 << inode->i_blkbits) - 1)) == 0);
ASSERT(end < PAGE_SIZE);
- ASSERT((bvec->bv_len & blockmask) == 0);
+ ASSERT((bvec->bv_len & ((1 << inode->i_blkbits) - 1)) == 0);
bh = head = page_buffers(bvec->bv_page);