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_linux.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_linux.h')
-rw-r--r-- | fs/xfs/xfs_linux.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h index 8312771..d3ef6de 100644 --- a/fs/xfs/xfs_linux.h +++ b/fs/xfs/xfs_linux.h @@ -21,18 +21,6 @@ #include <linux/types.h> /* - * XFS_BIG_BLKNOS needs block layer disk addresses to be 64 bits. - * XFS_BIG_INUMS requires XFS_BIG_BLKNOS to be set. - */ -#if defined(CONFIG_LBDAF) || (BITS_PER_LONG == 64) -# define XFS_BIG_BLKNOS 1 -# define XFS_BIG_INUMS 1 -#else -# define XFS_BIG_BLKNOS 0 -# define XFS_BIG_INUMS 0 -#endif - -/* * Kernel specific type declarations for XFS */ typedef signed char __int8_t; |