OSDN Git Service

staging/lustre: Drop FS_HAS_FIEMAP compat macro
authorOleg Drokin <green@linuxhacker.ru>
Thu, 30 Jul 2015 22:27:54 +0000 (18:27 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 31 Jul 2015 23:01:42 +0000 (16:01 -0700)
FS_HAS_FIEMAP was some sort of old RHEL5 construct that's not
really important anymore

Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/include/linux/lustre_compat25.h
drivers/staging/lustre/lustre/obdclass/obd_mount.c

index e7d57e8..1a6b2fb 100644 (file)
 # define inode_dio_read(i)             atomic_inc(&(i)->i_dio_count)
 /* inode_dio_done(i) use as-is for read unlock */
 
-
-#ifndef FS_HAS_FIEMAP
-#define FS_HAS_FIEMAP                  (0)
-#endif
-
 #ifndef SLAB_DESTROY_BY_RCU
 #define SLAB_DESTROY_BY_RCU 0
 #endif
index 3e0b8a4..40ab7b2 100644 (file)
@@ -1281,7 +1281,7 @@ struct file_system_type lustre_fs_type = {
        .mount  = lustre_mount,
        .kill_sb      = lustre_kill_super,
        .fs_flags     = FS_BINARY_MOUNTDATA | FS_REQUIRES_DEV |
-                       FS_HAS_FIEMAP | FS_RENAME_DOES_D_MOVE,
+                       FS_RENAME_DOES_D_MOVE,
 };
 MODULE_ALIAS_FS("lustre");