diff options
| author | Dave Chinner <dchinner@redhat.com> | 2012-06-08 15:44:54 +1000 | 
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2012-06-14 12:28:24 -0500 | 
| commit | 32972383ca46223aa2b129826b3789721ec147aa (patch) | |
| tree | 11750ff77efd52b933bb1531b0129eb32597fff8 /fs/xfs/xfs_vnodeops.c | |
| parent | d2c2819117176e139dc761873c664aaa770c79c9 (diff) | |
| download | olio-linux-3.10-32972383ca46223aa2b129826b3789721ec147aa.tar.xz olio-linux-3.10-32972383ca46223aa2b129826b3789721ec147aa.zip  | |
xfs: make largest supported offset less shouty
XFS_MAXIOFFSET() is just a simple macro that resolves to
mp->m_maxioffset. It doesn't need to exist, and it just makes the
code unnecessarily loud and shouty.
Make it quiet and easy to read.
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_vnodeops.c')
| -rw-r--r-- | fs/xfs/xfs_vnodeops.c | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index b6a82d817a8..c22f4e0ecac 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c @@ -174,7 +174,7 @@ xfs_free_eofblocks(  	 * of the file.  If not, then there is nothing to do.  	 */  	end_fsb = XFS_B_TO_FSB(mp, (xfs_ufsize_t)XFS_ISIZE(ip)); -	last_fsb = XFS_B_TO_FSB(mp, (xfs_ufsize_t)XFS_MAXIOFFSET(mp)); +	last_fsb = XFS_B_TO_FSB(mp, mp->m_super->s_maxbytes);  	if (last_fsb <= end_fsb)  		return 0;  	map_len = last_fsb - end_fsb; @@ -2262,10 +2262,10 @@ xfs_change_file_space(  	llen = bf->l_len > 0 ? bf->l_len - 1 : bf->l_len; -	if (   (bf->l_start < 0) -	    || (bf->l_start > XFS_MAXIOFFSET(mp)) -	    || (bf->l_start + llen < 0) -	    || (bf->l_start + llen > XFS_MAXIOFFSET(mp))) +	if (bf->l_start < 0 || +	    bf->l_start > mp->m_super->s_maxbytes || +	    bf->l_start + llen < 0 || +	    bf->l_start + llen > mp->m_super->s_maxbytes)  		return XFS_ERROR(EINVAL);  	bf->l_whence = 0;  |