[xfs-masters] [patch 1/2] fs/xfs/xfs_dmapi.h Removal of old code

[akpm@xxxxxxxx]

From: Michal Piotrowski <michal.k.k.piotrowski@xxxxxxxxx>

Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@xxxxxxxxx>
Cc: Nathan Scott <nathans@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 fs/xfs/xfs_dmapi.h |   17 +----------------
 1 file 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
_