diff options
| author | Dave Chinner <david@fromorbit.com> | 2014-08-04 13:54:14 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-08-04 13:54:14 +1000 |
| commit | 4d7eece2c0dad832c5f224629eba3cced3f2d6cd (patch) | |
| tree | cddf541ea3c2860aaea0fed1f57871d310c3c14e /fs/xfs/xfs_fs.h | |
| parent | e0ac6d45bc52065d388b5aa153b58233af25a429 (diff) | |
| parent | d5cf09baced0ef3d2cc118865079f8b129e98e2f (diff) | |
| download | op-kernel-dev-4d7eece2c0dad832c5f224629eba3cced3f2d6cd.zip op-kernel-dev-4d7eece2c0dad832c5f224629eba3cced3f2d6cd.tar.gz | |
Merge branch 'xfs-misc-fixes-3.17-1' into for-next
Diffstat (limited to 'fs/xfs/xfs_fs.h')
| -rw-r--r-- | fs/xfs/xfs_fs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_fs.h b/fs/xfs/xfs_fs.h index ffdabc6..18dc721 100644 --- a/fs/xfs/xfs_fs.h +++ b/fs/xfs/xfs_fs.h @@ -255,8 +255,8 @@ typedef struct xfs_fsop_resblks { ((2 * 1024 * 1024 * 1024ULL) - XFS_MIN_LOG_BYTES) /* Used for sanity checks on superblock */ -#define XFS_MAX_DBLOCKS(s) ((xfs_drfsbno_t)(s)->sb_agcount * (s)->sb_agblocks) -#define XFS_MIN_DBLOCKS(s) ((xfs_drfsbno_t)((s)->sb_agcount - 1) * \ +#define XFS_MAX_DBLOCKS(s) ((xfs_rfsblock_t)(s)->sb_agcount * (s)->sb_agblocks) +#define XFS_MIN_DBLOCKS(s) ((xfs_rfsblock_t)((s)->sb_agcount - 1) * \ (s)->sb_agblocks + XFS_MIN_AG_BLOCKS) /* |
