LU-11838 lustre: discard LTIME_S macro

[fs/lustre-release.git] / lustre / include / lustre_compat.h

diff --git a/lustre/include/lustre_compat.h b/lustre/include/lustre_compat.h
index 34465f1..df20146 100644 (file)
--- a/lustre/include/lustre_compat.h
+++ b/lustre/include/lustre_compat.h
@@ -99,8 +99,6 @@ static inline void ll_set_fs_pwd(struct fs_struct *fs, struct vfsmount *mnt,
 #define MODULE_ALIAS_FS(name)
 #endif
 
-#define LTIME_S(time)                   (time.tv_sec)
-
 #ifdef HAVE_GENERIC_PERMISSION_2ARGS
 # define ll_generic_permission(inode, mask, flags, check_acl) \
         generic_permission(inode, mask)
@@ -742,6 +740,7 @@ static inline unsigned int bip_size(struct bio_integrity_payload *bip)
 #endif
 }
 
+#ifdef HAVE_BLK_INTEGRITY_ENABLED
 #ifndef INTEGRITY_FLAG_READ
 #define INTEGRITY_FLAG_READ BLK_INTEGRITY_VERIFY
 #endif
@@ -777,6 +776,12 @@ static inline bool bdev_integrity_enabled(struct block_device *bdev, int rw)
 
        return false;
 }
+#else
+static inline bool bdev_integrity_enabled(struct block_device *bdev, int rw)
+{
+       return false;
+}
+#endif /* HAVE_BLK_INTEGRITY_ENABLED */
 
 #ifdef HAVE_PAGEVEC_INIT_ONE_PARAM
 #define ll_pagevec_init(pvec, n) pagevec_init(pvec)