Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7031d0e1c46e2b1c869458233dd216cb72af41b2

Authored by Dave Chinner
Committed by Ben Myers
1 parent 480d7467e4
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

xfs: fix rounding in xfs_free_file_space 

The offset passed into xfs_free_file_space() needs to be rounded
down to a certain size, but the rounding mask is built by a 32 bit
variable. Hence the mask will always mask off the upper 32 bits of
the offset and lead to incorrect writeback and invalidation ranges.

This is not actually exposed as a bug because we writeback and
invalidate from the rounded offset to the end of the file, and hence
the offset we are actually punching a hole out of will always be
covered by the code. This needs fixing, however, if we ever want to
use exact ranges for writeback/invalidation here...

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>

(cherry picked from commit 28ca489c63e9aceed8801d2f82d731b3c9aa50f5)

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

fs/xfs/xfs_vnodeops.c
Diff comments   View file @ 7031d0e
... ... @@ -1453,7 +1453,7 @@
1453 1453 xfs_mount_t *mp;
1454 1454 int nimap;
1455 1455 uint resblks;
1456   - uint rounding;
  1456 + xfs_off_t rounding;
1457 1457 int rt;
1458 1458 xfs_fileoff_t startoffset_fsb;
1459 1459 xfs_trans_t *tp;
... ... @@ -1482,7 +1482,7 @@
1482 1482 inode_dio_wait(VFS_I(ip));
1483 1483 }
1484 1484  
1485   - rounding = max_t(uint, 1 << mp->m_sb.sb_blocklog, PAGE_CACHE_SIZE);
  1485 + rounding = max_t(xfs_off_t, 1 << mp->m_sb.sb_blocklog, PAGE_CACHE_SIZE);
1486 1486 ioffset = offset & ~(rounding - 1);
1487 1487 error = -filemap_write_and_wait_range(VFS_I(ip)->i_mapping,
1488 1488 ioffset, -1);