[lustre-devel] [PATCH 04/21] lustre: misc: remove OBD_ -> CFS_ macros

[James Simmons]

From: Timothy Day <timday at amazon.com>

Remove OBD macros that are simply redefinitions
of CFS macros.

WC-bug-id: https://jira.whamcloud.com/browse/LU-12610
Lustre-commit: 424fa1bff070d0382 ("LU-12610 misc: remove OBD_ -> CFS_ macros")
Signed-off-by: Timothy Day <timday at amazon.com>
Signed-off-by: Ben Evans <beevans at whamcloud.com>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50809
Reviewed-by: Andreas Dilger <adilger at whamcloud.com>
Reviewed-by: James Simmons <jsimmons at infradead.org>
Reviewed-by: Neil Brown <neilb at suse.de>
Reviewed-by: Oleg Drokin <green at whamcloud.com>
Signed-off-by: James Simmons <jsimmons at infradead.org>
---
 fs/lustre/fid/fid_request.c | 2 +-
 fs/lustre/fld/fld_request.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/lustre/fid/fid_request.c b/fs/lustre/fid/fid_request.c
index c41932fadc7d..78525bac252f 100644
--- a/fs/lustre/fid/fid_request.c
+++ b/fs/lustre/fid/fid_request.c
@@ -210,7 +210,7 @@ int seq_client_alloc_fid(const struct lu_env *env,
 
 	spin_lock(&seq->lcs_lock);
 
-	if (OBD_FAIL_CHECK(OBD_FAIL_SEQ_EXHAUST))
+	if (CFS_FAIL_CHECK(OBD_FAIL_SEQ_EXHAUST))
 		seq->lcs_fid.f_oid = seq->lcs_width;
 
 	wait_event_cmd(seq->lcs_waitq,
diff --git a/fs/lustre/fld/fld_request.c b/fs/lustre/fld/fld_request.c
index bafd5a9f4aad..0fe8cef6e945 100644
--- a/fs/lustre/fld/fld_request.c
+++ b/fs/lustre/fld/fld_request.c
@@ -364,7 +364,7 @@ int fld_client_rpc(struct obd_export *exp,
 	req->rq_reply_portal = MDC_REPLY_PORTAL;
 	ptlrpc_at_set_req_timeout(req);
 
-	if (OBD_FAIL_CHECK(OBD_FAIL_FLD_QUERY_REQ) && req->rq_no_delay) {
+	if (CFS_FAIL_CHECK(OBD_FAIL_FLD_QUERY_REQ) && req->rq_no_delay) {
 		/* the same error returned by ptlrpc_import_delay_req */
 		rc = -EAGAIN;
 		req->rq_status = rc;
-- 
2.39.3