From 7a7d075d501f4f7eee9c8c38fd4bd67fd891b251 Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Fri, 5 Jul 2019 13:13:26 -0400 Subject: [PATCH] LU-12514 obdclass: Drop FS_HAS_FIEMAP compat macro FS_HAS_FIEMAP was some sort of old RHEL5 construct that's not really important anymore Linux-commit: 5c8eae72ff46f0e70d03ae2e86e631d7a1ca4fe6 Change-Id: Ia9941fa32eeb6114f9404014b78c29465d524d07 Signed-off-by: Oleg Drokin Signed-off-by: Greg Kroah-Hartman Reviewed-on: https://review.whamcloud.com/35424 Tested-by: jenkins Reviewed-by: Andreas Dilger Tested-by: Maloo Reviewed-by: Alex Zhuravlev --- lustre/include/lustre_compat.h | 4 ---- lustre/obdclass/obd_mount.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/lustre/include/lustre_compat.h b/lustre/include/lustre_compat.h index 284f4ee..03a1c3a 100644 --- a/lustre/include/lustre_compat.h +++ b/lustre/include/lustre_compat.h @@ -134,10 +134,6 @@ static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt, # define inode_dio_write_done(i) up_write(&(i)->i_alloc_sem) #endif -#ifndef FS_HAS_FIEMAP -#define FS_HAS_FIEMAP (0) -#endif - #ifndef HAVE_SIMPLE_SETATTR #define simple_setattr(dentry, ops) inode_setattr((dentry)->d_inode, ops) #endif diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c index 65fe8fa..85da147 100644 --- a/lustre/obdclass/obd_mount.c +++ b/lustre/obdclass/obd_mount.c @@ -1737,7 +1737,7 @@ static struct file_system_type lustre_fs_type = { .get_sb = lustre_get_sb, #endif .kill_sb = lustre_kill_super, - .fs_flags = FS_REQUIRES_DEV | FS_HAS_FIEMAP | FS_RENAME_DOES_D_MOVE, + .fs_flags = FS_REQUIRES_DEV | FS_RENAME_DOES_D_MOVE, }; MODULE_ALIAS_FS("lustre"); -- 1.8.3.1