diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2021-05-31 11:31:56 -0700 |
|---|---|---|
| committer | Darrick J. Wong <djwong@kernel.org> | 2021-06-01 12:53:59 -0700 |
| commit | 20bd8e63f30be23ff544d6bd77fc3b933464100b (patch) | |
| tree | e92f47b43da381db60897a260a840e03e42610c9 | |
| parent | a7bcb147fef39054fe324a1a988470f5da127196 (diff) | |
xfs: remove unnecessary shiftsunit-conversion-cleanups-5.14_2021-06-06unit-conversion-cleanups-5.14_2021-06-05unit-conversion-cleanups-5.14_2021-06-03unit-conversion-cleanups-5.14_2021-06-01
The superblock verifier already validates that (1 << blocklog) ==
blocksize, so use the value directly instead of doing math.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
| -rw-r--r-- | fs/xfs/xfs_bmap_util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c index 0936f3a96fe6..997eb5c6e9b4 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -945,7 +945,7 @@ xfs_flush_unmap_range( xfs_off_t rounding, start, end; int error; - rounding = max_t(xfs_off_t, 1 << mp->m_sb.sb_blocklog, PAGE_SIZE); + rounding = max_t(xfs_off_t, mp->m_sb.sb_blocksize, PAGE_SIZE); start = round_down(offset, rounding); end = round_up(offset + len, rounding) - 1; @@ -1053,9 +1053,9 @@ xfs_prepare_shift( * extent (after split) during the shift and corrupt the file. Start * with the block just prior to the start to stabilize the boundary. */ - offset = round_down(offset, 1 << mp->m_sb.sb_blocklog); + offset = round_down(offset, mp->m_sb.sb_blocksize); if (offset) - offset -= (1 << mp->m_sb.sb_blocklog); + offset -= mp->m_sb.sb_blocksize; /* * Writeback and invalidate cache for the remainder of the file as we're |