diff options
author | Christoph Hellwig <hch@lst.de> | 2014-07-29 19:12:05 -0400 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2014-07-29 19:12:05 -0400 |
commit | d5cf09baced0ef3d2cc118865079f8b129e98e2f (patch) | |
tree | 124fb5a2e0d711952cbe7668bb55b7a7aaa5792a /fs/xfs/xfs_mount.c | |
parent | 74dc93a9087fc71240486d914b4a95f8e510e0e4 (diff) |
xfs: require 64-bit sector_t
Trying to support tiny disks only and saving a bit memory might have
made sense on an SGI O2 15 years ago, but is pretty pointless today.
Remove the rarely tested codepath that uses various smaller in-memory
types to reduce our test matrix and make the codebase a little bit
smaller and less complicated.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/xfs_mount.c')
-rw-r--r-- | fs/xfs/xfs_mount.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index f205a2c84c7a..e0e232efe9af 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c | |||
@@ -173,13 +173,9 @@ xfs_sb_validate_fsb_count( | |||
173 | ASSERT(PAGE_SHIFT >= sbp->sb_blocklog); | 173 | ASSERT(PAGE_SHIFT >= sbp->sb_blocklog); |
174 | ASSERT(sbp->sb_blocklog >= BBSHIFT); | 174 | ASSERT(sbp->sb_blocklog >= BBSHIFT); |
175 | 175 | ||
176 | #if XFS_BIG_BLKNOS /* Limited by ULONG_MAX of page cache index */ | 176 | /* Limited by ULONG_MAX of page cache index */ |
177 | if (nblocks >> (PAGE_CACHE_SHIFT - sbp->sb_blocklog) > ULONG_MAX) | 177 | if (nblocks >> (PAGE_CACHE_SHIFT - sbp->sb_blocklog) > ULONG_MAX) |
178 | return -EFBIG; | 178 | return -EFBIG; |
179 | #else /* Limited by UINT_MAX of sectors */ | ||
180 | if (nblocks << (sbp->sb_blocklog - BBSHIFT) > UINT_MAX) | ||
181 | return -EFBIG; | ||
182 | #endif | ||
183 | return 0; | 179 | return 0; |
184 | } | 180 | } |
185 | 181 | ||