LU-12610 target: remove OBD_ -> CFS_ macros

Remove OBD macros that are simply redefinitions
of CFS macros.

Test-Parameters: trivial
Signed-off-by: Timothy Day <timday@amazon.com>
Signed-off-by: Ben Evans <beevans@whamcloud.com>
Change-Id: I97e3f74d72d41558f293567b4609fa37aaa3b13d
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/51123
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>

diff --git a/lustre/target/barrier.c b/lustre/target/barrier.c
index 4f8c5b3..1ace636 100644 (file)
--- a/lustre/target/barrier.c
+++ b/lustre/target/barrier.c
@@ -319,7 +319,7 @@ int barrier_handler(struct dt_device *key, struct ptlrpc_request *req)
                break;
        case BS_FREEZING_P1:
        case BS_FREEZING_P2:
-               if (OBD_FAIL_CHECK(OBD_FAIL_BARRIER_FAILURE))
+               if (CFS_FAIL_CHECK(OBD_FAIL_BARRIER_FAILURE))
                        GOTO(fini, rc = -EINVAL);
 
                barrier->bi_deadline = ktime_get_real_seconds() +

diff --git a/lustre/target/out_handler.c b/lustre/target/out_handler.c
index c70eade..ca215a3 100644 (file)
--- a/lustre/target/out_handler.c
+++ b/lustre/target/out_handler.c
@@ -589,7 +589,7 @@ static int out_destroy(struct tgt_session_info *tsi)
                            tti->tti_u.update.tti_update_reply,
                            tti->tti_u.update.tti_update_reply_index);
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OUT_DROP_DESTROY))
+       if (CFS_FAIL_CHECK(OBD_FAIL_OUT_DROP_DESTROY))
                tsi->tsi_pill->rc_req->rq_no_reply = 1;
 
        RETURN(rc);
@@ -1194,7 +1194,7 @@ int out_handle(struct tgt_session_info *tsi)
                                }
                        }
 
-                       if (OBD_FAIL_CHECK(OBD_FAIL_OUT_EIO))
+                       if (CFS_FAIL_CHECK(OBD_FAIL_OUT_EIO))
                                rc = -EIO;
                        else
                                rc = h->th_act(tsi);

diff --git a/lustre/target/out_lib.c b/lustre/target/out_lib.c
index a1f2966..24652ea 100644 (file)
--- a/lustre/target/out_lib.c
+++ b/lustre/target/out_lib.c
@@ -693,7 +693,7 @@ static int out_tx_write_exec(const struct lu_env *env, struct thandle *th,
               PFID(lu_object_fid(&dt_obj->do_lu)), arg->u.write.pos,
               arg->u.write.buf.lb_buf, (unsigned long)arg->u.write.buf.lb_len);
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OUT_ENOSPC)) {
+       if (CFS_FAIL_CHECK(OBD_FAIL_OUT_ENOSPC)) {
                rc = -ENOSPC;
        } else {
                dt_write_lock(env, dt_obj, DT_TGT_CHILD);
@@ -751,7 +751,7 @@ static int out_tx_xattr_set_exec(const struct lu_env *env,
               arg->u.xattr_set.name, arg->u.xattr_set.flags);
 
        if (!lu_object_exists(&dt_obj->do_lu) ||
-           OBD_FAIL_PRECHECK(OBD_FAIL_OUT_OBJECT_MISS)) {
+           CFS_FAIL_PRECHECK(OBD_FAIL_OUT_OBJECT_MISS)) {
                rc = -ENOENT;
        } else {
                struct linkea_data ldata = { 0 };

diff --git a/lustre/target/tgt_grant.c b/lustre/target/tgt_grant.c
index 024c23f..1f21085 100644 (file)
--- a/lustre/target/tgt_grant.c
+++ b/lustre/target/tgt_grant.c
@@ -912,7 +912,7 @@ static long tgt_grant_alloc(struct obd_export *exp, u64 curgrant,
 
        ENTRY;
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_TGT_NO_GRANT))
+       if (CFS_FAIL_CHECK(OBD_FAIL_TGT_NO_GRANT))
                RETURN(0);
 
        /* When tgd_grant_compat_disable is set, we don't grant any space to

diff --git a/lustre/target/tgt_handler.c b/lustre/target/tgt_handler.c
index dc518a2..8f347a3 100644 (file)
--- a/lustre/target/tgt_handler.c
+++ b/lustre/target/tgt_handler.c
@@ -413,15 +413,15 @@ static int tgt_handle_request0(struct tgt_session_info *tsi,
         * network failure. Do not send any reply in case any of NET related
         * fail_id has occured.
         */
-       if (OBD_FAIL_CHECK_ORSET(h->th_fail_id, OBD_FAIL_ONCE))
+       if (CFS_FAIL_CHECK_ORSET(h->th_fail_id, CFS_FAIL_ONCE))
                RETURN(0);
        if (unlikely(lustre_msg_get_opc(req->rq_reqmsg) == MDS_REINT &&
-                    OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_MULTI_NET)))
+                    CFS_FAIL_CHECK(OBD_FAIL_MDS_REINT_MULTI_NET)))
                RETURN(0);
 
        /* drop OUT_UPDATE rpc */
        if (unlikely(lustre_msg_get_opc(req->rq_reqmsg) == OUT_UPDATE &&
-                    OBD_FAIL_CHECK(OBD_FAIL_OUT_UPDATE_DROP)))
+                    CFS_FAIL_CHECK(OBD_FAIL_OUT_UPDATE_DROP)))
                RETURN(0);
 
        rc = tgt_request_preprocess(tsi, h, req);
@@ -648,7 +648,7 @@ static struct tgt_handler *tgt_handler_find_check(struct ptlrpc_request *req)
                goto err_unsupported;
        }
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OST_OPCODE) && opc == cfs_fail_val)
+       if (CFS_FAIL_CHECK(OBD_FAIL_OST_OPCODE) && opc == cfs_fail_val)
                goto err_unsupported;
 
        RETURN(h);
@@ -758,7 +758,7 @@ int tgt_request_handle(struct ptlrpc_request *req)
        bool                     is_connect = false;
        ENTRY;
 
-       if (unlikely(OBD_FAIL_CHECK(OBD_FAIL_TGT_RECOVERY_REQ_RACE))) {
+       if (unlikely(CFS_FAIL_CHECK(OBD_FAIL_TGT_RECOVERY_REQ_RACE))) {
                if (cfs_fail_val == 0 &&
                    lustre_msg_get_opc(msg) != OBD_PING &&
                    lustre_msg_get_flags(msg) & MSG_REQ_REPLAY_DONE) {
@@ -785,7 +785,7 @@ int tgt_request_handle(struct ptlrpc_request *req)
                }
                /* recovery-small test 18c asks to drop connect reply */
                if (unlikely(opc == OST_CONNECT &&
-                            OBD_FAIL_CHECK(OBD_FAIL_OST_CONNECT_NET2)))
+                            CFS_FAIL_CHECK(OBD_FAIL_OST_CONNECT_NET2)))
                        GOTO(out, rc = 0);
        }
 
@@ -1107,7 +1107,7 @@ int tgt_disconnect(struct tgt_session_info *tsi)
 
        ENTRY;
 
-       OBD_FAIL_TIMEOUT(OBD_FAIL_OST_DISCONNECT_DELAY, cfs_fail_val);
+       CFS_FAIL_TIMEOUT(OBD_FAIL_OST_DISCONNECT_DELAY, cfs_fail_val);
 
        rc = target_handle_disconnect(tgt_ses_req(tsi));
        if (rc)
@@ -1856,7 +1856,7 @@ static int tgt_checksum_niobuf(struct lu_target *tgt,
                /* corrupt the data before we compute the checksum, to
                 * simulate a client->OST data error */
                if (i == 0 && opc == OST_WRITE &&
-                   OBD_FAIL_CHECK(OBD_FAIL_OST_CHECKSUM_RECEIVE)) {
+                   CFS_FAIL_CHECK(OBD_FAIL_OST_CHECKSUM_RECEIVE)) {
                        int off = local_nb[i].lnb_page_offset & ~PAGE_MASK;
                        int len = local_nb[i].lnb_len;
                        struct page *np = tgt_page_to_corrupt;
@@ -1888,7 +1888,7 @@ static int tgt_checksum_niobuf(struct lu_target *tgt,
                 /* corrupt the data after we compute the checksum, to
                 * simulate an OST->client data error */
                if (i == 0 && opc == OST_READ &&
-                   OBD_FAIL_CHECK(OBD_FAIL_OST_CHECKSUM_SEND)) {
+                   CFS_FAIL_CHECK(OBD_FAIL_OST_CHECKSUM_SEND)) {
                        int off = local_nb[i].lnb_page_offset & ~PAGE_MASK;
                        int len = local_nb[i].lnb_len;
                        struct page *np = tgt_page_to_corrupt;
@@ -2115,7 +2115,7 @@ static int tgt_checksum_niobuf_t10pi(struct lu_target *tgt,
                /* corrupt the data before we compute the checksum, to
                 * simulate a client->OST data error */
                if (i == 0 && opc == OST_WRITE &&
-                   OBD_FAIL_CHECK(OBD_FAIL_OST_CHECKSUM_RECEIVE)) {
+                   CFS_FAIL_CHECK(OBD_FAIL_OST_CHECKSUM_RECEIVE)) {
                        struct page *np = tgt_page_to_corrupt;
 
                        if (np) {
@@ -2235,7 +2235,7 @@ static int tgt_checksum_niobuf_t10pi(struct lu_target *tgt,
                 /* corrupt the data after we compute the checksum, to
                 * simulate an OST->client data error */
                if (unlikely(i == 0 && opc == OST_READ &&
-                            OBD_FAIL_CHECK(OBD_FAIL_OST_CHECKSUM_SEND))) {
+                            CFS_FAIL_CHECK(OBD_FAIL_OST_CHECKSUM_SEND))) {
                        struct page *np = tgt_page_to_corrupt;
 
                        if (np) {
@@ -2331,7 +2331,7 @@ int tgt_brw_read(struct tgt_session_info *tsi)
 
        req->rq_bulk_read = 1;
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OST_BRW_READ_BULK)) {
+       if (CFS_FAIL_CHECK(OBD_FAIL_OST_BRW_READ_BULK)) {
                /* optionally use cfs_fail_val - 1 to select a specific OST on
                 * this server to fail requests.
                 */
@@ -2348,7 +2348,7 @@ int tgt_brw_read(struct tgt_session_info *tsi)
                }
        }
 
-       OBD_FAIL_TIMEOUT(OBD_FAIL_OST_BRW_PAUSE_BULK, cfs_fail_val > 0 ?
+       CFS_FAIL_TIMEOUT(OBD_FAIL_OST_BRW_PAUSE_BULK, cfs_fail_val > 0 ?
                         cfs_fail_val : (obd_timeout + 1) / 4);
 
        /* Check if there is eviction in progress, and if so, wait for it to
@@ -2391,7 +2391,7 @@ int tgt_brw_read(struct tgt_session_info *tsi)
         * client was willing to wait, drop it. b=11330
         */
        if (ktime_get_real_seconds() > req->rq_deadline ||
-           OBD_FAIL_CHECK(OBD_FAIL_OST_DROP_REQ)) {
+           CFS_FAIL_CHECK(OBD_FAIL_OST_DROP_REQ)) {
                no_reply = 1;
                CERROR("Dropping timed-out read from %s because locking object " DOSTID " took %lld seconds (limit was %lld).\n",
                       libcfs_idstr(&req->rq_peer), POSTID(&ioo->ioo_oid),
@@ -2570,7 +2570,7 @@ out_lock:
                target_send_reply(req, 0, 0);
 
                CDEBUG(D_INFO, "reorder BULK\n");
-               OBD_FAIL_TIMEOUT(OBD_FAIL_PTLRPC_CLIENT_BULK_CB2,
+               CFS_FAIL_TIMEOUT(OBD_FAIL_PTLRPC_CLIENT_BULK_CB2,
                                 cfs_fail_val ? : 3);
 
                target_bulk_io(exp, desc);
@@ -2689,16 +2689,16 @@ int tgt_brw_write(struct tgt_session_info *tsi)
                RETURN(err_serious(-EPROTO));
        }
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OST_ENOSPC))
+       if (CFS_FAIL_CHECK(OBD_FAIL_OST_ENOSPC))
                RETURN(err_serious(-ENOSPC));
-       if (OBD_FAIL_TIMEOUT(OBD_FAIL_OST_EROFS, 1))
+       if (CFS_FAIL_TIMEOUT(OBD_FAIL_OST_EROFS, 1))
                RETURN(err_serious(-EROFS));
 
        req->rq_bulk_write = 1;
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OST_BRW_WRITE_BULK))
+       if (CFS_FAIL_CHECK(OBD_FAIL_OST_BRW_WRITE_BULK))
                rc = -EIO;
-       if (OBD_FAIL_CHECK(OBD_FAIL_OST_BRW_WRITE_BULK2))
+       if (CFS_FAIL_CHECK(OBD_FAIL_OST_BRW_WRITE_BULK2))
                rc = -EFAULT;
        if (rc < 0) {
                /* optionally use cfs_fail_val - 1 to select a specific OST on
@@ -2779,7 +2779,7 @@ int tgt_brw_write(struct tgt_session_info *tsi)
         * client was willing to wait, drop it. b=11330
         */
        if (ktime_get_real_seconds() > req->rq_deadline ||
-           OBD_FAIL_CHECK(OBD_FAIL_OST_DROP_REQ)) {
+           CFS_FAIL_CHECK(OBD_FAIL_OST_DROP_REQ)) {
                no_reply = true;
                CERROR("%s: Dropping timed-out write from %s because locking object " DOSTID " took %lld seconds (limit was %lld).\n",
                       tgt_name(tsi->tsi_tgt), libcfs_idstr(&req->rq_peer),
@@ -2885,7 +2885,7 @@ skip_transfer:
                }
        }
 
-       OBD_FAIL_TIMEOUT(OBD_FAIL_OST_BRW_PAUSE_BULK2, cfs_fail_val);
+       CFS_FAIL_TIMEOUT(OBD_FAIL_OST_BRW_PAUSE_BULK2, cfs_fail_val);
 
 out_commitrw:
        /* calculate the expected actual write bytes (nob) for OFD stats.

diff --git a/lustre/target/tgt_lastrcvd.c b/lustre/target/tgt_lastrcvd.c
index f8d306c..d743ca6 100644 (file)
--- a/lustre/target/tgt_lastrcvd.c
+++ b/lustre/target/tgt_lastrcvd.c
@@ -1064,7 +1064,7 @@ int tgt_client_new(const struct lu_env *env, struct obd_export *exp)
        idx = find_first_zero_bit(tgt->lut_client_bitmap, LR_MAX_CLIENTS);
 repeat:
        if (idx >= LR_MAX_CLIENTS ||
-           OBD_FAIL_CHECK(OBD_FAIL_MDS_CLIENT_ADD)) {
+           CFS_FAIL_CHECK(OBD_FAIL_MDS_CLIENT_ADD)) {
                CERROR("%s: no room for %u clients - fix LR_MAX_CLIENTS\n",
                       tgt->lut_obd->obd_name,  idx);
                RETURN(-EOVERFLOW);
@@ -1109,7 +1109,7 @@ repeat:
               tgt->lut_obd->obd_name, ted->ted_lr_idx, ted->ted_lr_off,
               ted->ted_lcd->lcd_uuid, ted->ted_lcd->lcd_generation);
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_TGT_CLIENT_ADD))
+       if (CFS_FAIL_CHECK(OBD_FAIL_TGT_CLIENT_ADD))
                RETURN(-ENOSPC);
 
        rc = tgt_client_data_update(env, exp);
@@ -1216,7 +1216,7 @@ int tgt_client_del(const struct lu_env *env, struct obd_export *exp)
        if (exp->exp_flags & OBD_OPT_FAILOVER)
                RETURN(0);
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_TGT_CLIENT_DEL))
+       if (CFS_FAIL_CHECK(OBD_FAIL_TGT_CLIENT_DEL))
                RETURN(0);
 
        /* Make sure the server's last_transno is up to date.

diff --git a/lustre/target/tgt_mount.c b/lustre/target/tgt_mount.c
index 753e9dc..7e4aaa8 100644 (file)
--- a/lustre/target/tgt_mount.c
+++ b/lustre/target/tgt_mount.c
@@ -140,7 +140,7 @@ static int server_deregister_mount(const char *name)
        OBD_FREE(lmi, sizeof(*lmi));
        mutex_unlock(&lustre_mount_info_lock);
 
-       OBD_RACE(OBD_FAIL_MDS_LLOG_UMOUNT_RACE);
+       CFS_RACE(OBD_FAIL_MDS_LLOG_UMOUNT_RACE);
        RETURN(0);
 }
 
@@ -1408,9 +1408,9 @@ static int server_start_targets(struct super_block *sb)
        }
        lsi->lsi_server_started = 1;
        mutex_unlock(&server_start_lock);
-       if (OBD_FAIL_PRECHECK(OBD_FAIL_OBD_STOP_MDS_RACE) &&
+       if (CFS_FAIL_PRECHECK(OBD_FAIL_OBD_STOP_MDS_RACE) &&
            IS_MDT(lsi)) {
-               OBD_RACE(OBD_FAIL_OBD_STOP_MDS_RACE);
+               CFS_RACE(OBD_FAIL_OBD_STOP_MDS_RACE);
                msleep(2 * MSEC_PER_SEC);
        }
 
@@ -1663,13 +1663,13 @@ static void server_put_super(struct super_block *sb)
                         */
                        obd->obd_force = 1;
                        class_manual_cleanup(obd);
-                       if (OBD_FAIL_PRECHECK(OBD_FAIL_OBD_STOP_MDS_RACE)) {
+                       if (CFS_FAIL_PRECHECK(OBD_FAIL_OBD_STOP_MDS_RACE)) {
                                int idx;
 
                                server_name2index(lsi->lsi_svname, &idx, NULL);
                                /* sleeping for MDT0001 */
                                if (idx == 1)
-                                       OBD_RACE(OBD_FAIL_OBD_STOP_MDS_RACE);
+                                       CFS_RACE(OBD_FAIL_OBD_STOP_MDS_RACE);
                        }
                } else {
                        CERROR("no obd %s\n", lsi->lsi_svname);
@@ -2091,7 +2091,7 @@ int server_fill_super(struct super_block *sb)
 
        ENTRY;
        /* to simulate target mount race */
-       OBD_RACE(OBD_FAIL_TGT_MOUNT_RACE);
+       CFS_RACE(OBD_FAIL_TGT_MOUNT_RACE);
 
        rc = lsi_prepare(lsi);
        if (rc < 0) {

diff --git a/lustre/target/update_trans.c b/lustre/target/update_trans.c
index 22b49e7..6591b88 100644 (file)
--- a/lustre/target/update_trans.c
+++ b/lustre/target/update_trans.c
@@ -1024,11 +1024,11 @@ stop_master_trans:
        /* Step 3: write updates to other MDTs */
        if (write_updates) {
                struct llog_update_record *lur;
-               if (OBD_FAIL_PRECHECK(OBD_FAIL_OUT_OBJECT_MISS)) {
+               if (CFS_FAIL_PRECHECK(OBD_FAIL_OUT_OBJECT_MISS)) {
                        if (cfs_fail_val == 1) {
                                long timeout = cfs_time_seconds(1) / 10;
 
-                               OBD_RACE(OBD_FAIL_OUT_OBJECT_MISS);
+                               CFS_RACE(OBD_FAIL_OUT_OBJECT_MISS);
                                set_current_state(TASK_UNINTERRUPTIBLE);
                                schedule_timeout(schedule_timeout(timeout));
                                cfs_fail_loc = 0;
@@ -1281,7 +1281,7 @@ static int distribute_txn_cancel_records(const struct lu_env *env,
        struct sub_thandle *st;
        ENTRY;
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_TGT_TXN_NO_CANCEL))
+       if (CFS_FAIL_CHECK(OBD_FAIL_TGT_TXN_NO_CANCEL))
                RETURN(0);
 
        top_multiple_thandle_dump(tmt, D_INFO);
@@ -1608,7 +1608,7 @@ static int distribute_txn_commit_thread(void *_arg)
                if (!task_is_running(current))
                        schedule();
 
-               if (OBD_FAIL_PRECHECK(OBD_FAIL_OUT_OBJECT_MISS)) {
+               if (CFS_FAIL_PRECHECK(OBD_FAIL_OUT_OBJECT_MISS)) {
                        set_current_state(TASK_UNINTERRUPTIBLE);
                        schedule_timeout(cfs_time_seconds(5));
                }