From: Li Dongyang <dongyangli@ddn.com>
Date: Thu, 9 Jan 2020 10:33:24 +0000 (+1100)
Subject: LU-11770 misc: fix bdev_integrity_enabled definition
X-Git-Tag: 2.12.4-RC1~12
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=6db0c4f08225f5907318aa27970f42896d1da94f;p=fs%2Flustre-release.git

LU-11770 misc: fix bdev_integrity_enabled definition

part of the patch was missed when it was backported
to b2_12, as a result bdev_integrity_enabled will
always defined as a function just returns false.

Change-Id: I9c9a83f3011f939e7f6d72140c08943d82a5416d
Fixes: b14e6617b9 ("LU-11770 osc: allow build without blk_integrity or crc-t10pi")
Test-Parameters: trivial
Signed-off-by: Li Dongyang <dongyangli@ddn.com>
Reviewed-on: https://review.whamcloud.com/37167
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
---

diff --git a/lustre/include/lustre_compat.h b/lustre/include/lustre_compat.h
index cec2c55..097fc42 100644
--- a/lustre/include/lustre_compat.h
+++ b/lustre/include/lustre_compat.h
@@ -737,7 +737,6 @@ static inline const char *blk_integrity_name(struct blk_integrity *bi)
 }
 #endif /* !CONFIG_BLK_DEV_INTEGRITY */
 
-#ifdef HAVE_BLK_INTEGRITY_ENABLED
 #ifndef INTEGRITY_FLAG_READ
 #define INTEGRITY_FLAG_READ BLK_INTEGRITY_VERIFY
 #endif
@@ -775,12 +774,6 @@ 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)