From: Michal Piotrowski Signed-off-by: Michal Piotrowski Cc: Nathan Scott Signed-off-by: Andrew Morton --- fs/xfs/xfs_dmapi.h | 17 +---------------- 1 files changed, 1 insertion(+), 16 deletions(-) diff -puN fs/xfs/xfs_dmapi.h~fs-xfs-xfs_dmapih-removal-of-old-code fs/xfs/xfs_dmapi.h --- a/fs/xfs/xfs_dmapi.h~fs-xfs-xfs_dmapih-removal-of-old-code +++ a/fs/xfs/xfs_dmapi.h @@ -159,25 +159,10 @@ typedef enum { /* * Based on IO_ISDIRECT, decide which i_ flag is set. */ -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0) -#define DM_SEM_FLAG_RD(ioflags) (((ioflags) & IO_ISDIRECT) ? \ - DM_FLAGS_IMUX : 0) -#define DM_SEM_FLAG_WR (DM_FLAGS_IALLOCSEM_WR | DM_FLAGS_IMUX) -#endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)) && \ - (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,22)) #define DM_SEM_FLAG_RD(ioflags) (((ioflags) & IO_ISDIRECT) ? \ - DM_FLAGS_IALLOCSEM_RD : DM_FLAGS_IMUX) + DM_FLAGS_IMUX : 0) #define DM_SEM_FLAG_WR (DM_FLAGS_IALLOCSEM_WR | DM_FLAGS_IMUX) -#endif - -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,4,21) -#define DM_SEM_FLAG_RD(ioflags) (((ioflags) & IO_ISDIRECT) ? \ - 0 : DM_FLAGS_IMUX) -#define DM_SEM_FLAG_WR (DM_FLAGS_IMUX) -#endif - /* * Macros to turn caller specified delay/block flags into _