aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_aops.c
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2012-06-08 01:44:53 -0400
committerBen Myers <bpm@sgi.com>2012-06-14 13:28:22 -0400
commitd2c2819117176e139dc761873c664aaa770c79c9 (patch)
tree03c64c1d3f21f8628ca313b276ce327a3c012549 /fs/xfs/xfs_aops.c
parent0f2cf9d3d917b269645902506adaa4ff92b5e506 (diff)
xfs: m_maxioffset is redundant
The m_maxioffset field in the struct xfs_mount contains the same value as the superblock s_maxbytes field. There is no need to carry two copies of this limit around, so use the VFS superblock version. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_aops.c')
-rw-r--r--fs/xfs/xfs_aops.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 8dad722c0041..84e372596d56 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -323,10 +323,10 @@ xfs_map_blocks(
323 323
324 ASSERT(ip->i_d.di_format != XFS_DINODE_FMT_BTREE || 324 ASSERT(ip->i_d.di_format != XFS_DINODE_FMT_BTREE ||
325 (ip->i_df.if_flags & XFS_IFEXTENTS)); 325 (ip->i_df.if_flags & XFS_IFEXTENTS));
326 ASSERT(offset <= mp->m_maxioffset); 326 ASSERT(offset <= mp->m_super->s_maxbytes);
327 327
328 if (offset + count > mp->m_maxioffset) 328 if (offset + count > mp->m_super->s_maxbytes)
329 count = mp->m_maxioffset - offset; 329 count = mp->m_super->s_maxbytes - offset;
330 end_fsb = XFS_B_TO_FSB(mp, (xfs_ufsize_t)offset + count); 330 end_fsb = XFS_B_TO_FSB(mp, (xfs_ufsize_t)offset + count);
331 offset_fsb = XFS_B_TO_FSBT(mp, offset); 331 offset_fsb = XFS_B_TO_FSBT(mp, offset);
332 error = xfs_bmapi_read(ip, offset_fsb, end_fsb - offset_fsb, 332 error = xfs_bmapi_read(ip, offset_fsb, end_fsb - offset_fsb,
@@ -1162,9 +1162,9 @@ __xfs_get_blocks(
1162 lockmode = xfs_ilock_map_shared(ip); 1162 lockmode = xfs_ilock_map_shared(ip);
1163 } 1163 }
1164 1164
1165 ASSERT(offset <= mp->m_maxioffset); 1165 ASSERT(offset <= mp->m_super->s_maxbytes);
1166 if (offset + size > mp->m_maxioffset) 1166 if (offset + size > mp->m_super->s_maxbytes)
1167 size = mp->m_maxioffset - offset; 1167 size = mp->m_super->s_maxbytes - offset;
1168 end_fsb = XFS_B_TO_FSB(mp, (xfs_ufsize_t)offset + size); 1168 end_fsb = XFS_B_TO_FSB(mp, (xfs_ufsize_t)offset + size);
1169 offset_fsb = XFS_B_TO_FSBT(mp, offset); 1169 offset_fsb = XFS_B_TO_FSBT(mp, offset);
1170 1170