The patch titled fs/xfs/xfs_dmapi.h Removal of old code has been added to the -mm tree. Its filename is fs-xfs-xfs_dmapih-removal-of-old-code.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: fs/xfs/xfs_dmapi.h Removal of old code 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 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 _ Patches currently in -mm which might be from michal.k.k.piotrowski@xxxxxxxxx are fs-jffs2-jffs2_fs_ih-removal-of-old-code.patch drivers-net-acenicc-removal-of-old-code.patch drivers-mtd-nand-au1550ndc-removal-of-old-code.patch drivers-net-tokenring-lanstreamerc-removal-of-old-code.patch drivers-net-tokenring-lanstreamerh-removal-of-old-code.patch drivers-message-fusion-linux_compath-removal-of-old-code.patch drivers-net-typhoonc-removal-of-old-code.patch fs-xfs-xfs_dmapih-removal-of-old-code.patch drivers-scsi-dpt-dpti_i2oh-removal-of-old.patch drivers-scsi-gdthh-removal-of-old-scsi-code.patch drivers-scsi-nsp32h-removal-of-old-scsi-code.patch drivers-scsi-pcmcia-nsp_csh-removal-of-old.patch csa-basic-accounting-over-taskstats-fix.patch drivers-video-sis-init301h-removal-of-old.patch drivers-video-sis-initextlfbc-removal-of.patch drivers-video-sis-inith-removal-of-old-code.patch drivers-video-sis-osdefh-removal-of-old-code.patch drivers-video-sis-sis_accelc-removal-of-old.patch drivers-video-sis-sis_accelh-removal-of-old.patch drivers-video-sis-sis_mainc-removal-of-old.patch drivers-video-sis-sis_mainc-removal-of-old-2.patch drivers-video-sis-vgatypesh-removal-of-old.patch drivers-video-sis-sis_mainh-removal-of-old.patch the-scheduled-removal-of-some-oss-drivers-fix-fix.patch kill-include-linux-configh.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html