diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-09-28 10:56:26 +1000 |
|---|---|---|
| committer | Tim Shimmin <tes@sgi.com> | 2006-09-28 10:56:26 +1000 |
| commit | 673cdf5c72ff9551df08a71f2ac1a8fe02888e8d (patch) | |
| tree | 94857685aa78d1b1edc7f526a961ff59549cf415 | |
| parent | 87395deb0b3d174ffcc7f66569764f0715ac5174 (diff) | |
| download | kernel_samsung_aries-673cdf5c72ff9551df08a71f2ac1a8fe02888e8d.zip kernel_samsung_aries-673cdf5c72ff9551df08a71f2ac1a8fe02888e8d.tar.gz kernel_samsung_aries-673cdf5c72ff9551df08a71f2ac1a8fe02888e8d.tar.bz2 | |
[XFS] Fix rounding bug in xfs_free_file_space found by sparse checking.
SGI-PV: 954580
SGI-Modid: xfs-linux-melb:xfs-kern:26551a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
| -rw-r--r-- | fs/xfs/xfs_vnodeops.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index 23cfa58..4fbc3e1 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c @@ -4272,7 +4272,7 @@ xfs_free_file_space( xfs_mount_t *mp; int nimap; uint resblks; - int rounding; + uint rounding; int rt; xfs_fileoff_t startoffset_fsb; xfs_trans_t *tp; @@ -4313,8 +4313,7 @@ xfs_free_file_space( vn_iowait(vp); /* wait for the completion of any pending DIOs */ } - rounding = MAX((__uint8_t)(1 << mp->m_sb.sb_blocklog), - (__uint8_t)NBPP); + rounding = max_t(uint, 1 << mp->m_sb.sb_blocklog, NBPP); ilen = len + (offset & (rounding - 1)); ioffset = offset & ~(rounding - 1); if (ilen & (rounding - 1)) |