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>
break;
case BS_FREEZING_P1:
case BS_FREEZING_P2:
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() +
GOTO(fini, rc = -EINVAL);
barrier->bi_deadline = ktime_get_real_seconds() +
tti->tti_u.update.tti_update_reply,
tti->tti_u.update.tti_update_reply_index);
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);
tsi->tsi_pill->rc_req->rq_no_reply = 1;
RETURN(rc);
- if (OBD_FAIL_CHECK(OBD_FAIL_OUT_EIO))
+ if (CFS_FAIL_CHECK(OBD_FAIL_OUT_EIO))
rc = -EIO;
else
rc = h->th_act(tsi);
rc = -EIO;
else
rc = h->th_act(tsi);
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);
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);
rc = -ENOSPC;
} else {
dt_write_lock(env, dt_obj, DT_TGT_CHILD);
arg->u.xattr_set.name, arg->u.xattr_set.flags);
if (!lu_object_exists(&dt_obj->do_lu) ||
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 };
rc = -ENOENT;
} else {
struct linkea_data ldata = { 0 };
- 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
RETURN(0);
/* When tgd_grant_compat_disable is set, we don't grant any space to
* network failure. Do not send any reply in case any of NET related
* fail_id has occured.
*/
* 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 &&
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 &&
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);
RETURN(0);
rc = tgt_request_preprocess(tsi, h, req);
- 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);
goto err_unsupported;
RETURN(h);
bool is_connect = false;
ENTRY;
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) {
if (cfs_fail_val == 0 &&
lustre_msg_get_opc(msg) != OBD_PING &&
lustre_msg_get_flags(msg) & MSG_REQ_REPLAY_DONE) {
}
/* recovery-small test 18c asks to drop connect reply */
if (unlikely(opc == OST_CONNECT &&
}
/* 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)))
- 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)
rc = target_handle_disconnect(tgt_ses_req(tsi));
if (rc)
/* corrupt the data before we compute the checksum, to
* simulate a client->OST data error */
if (i == 0 && opc == OST_WRITE &&
/* 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;
int off = local_nb[i].lnb_page_offset & ~PAGE_MASK;
int len = local_nb[i].lnb_len;
struct page *np = tgt_page_to_corrupt;
/* corrupt the data after we compute the checksum, to
* simulate an OST->client data error */
if (i == 0 && opc == OST_READ &&
/* 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;
int off = local_nb[i].lnb_page_offset & ~PAGE_MASK;
int len = local_nb[i].lnb_len;
struct page *np = tgt_page_to_corrupt;
/* corrupt the data before we compute the checksum, to
* simulate a client->OST data error */
if (i == 0 && opc == OST_WRITE &&
/* 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) {
struct page *np = tgt_page_to_corrupt;
if (np) {
/* corrupt the data after we compute the checksum, to
* simulate an OST->client data error */
if (unlikely(i == 0 && opc == OST_READ &&
/* 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) {
struct page *np = tgt_page_to_corrupt;
if (np) {
- 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.
*/
/* optionally use cfs_fail_val - 1 to select a specific OST on
* this server to fail requests.
*/
- 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
cfs_fail_val : (obd_timeout + 1) / 4);
/* Check if there is eviction in progress, and if so, wait for it to
* client was willing to wait, drop it. b=11330
*/
if (ktime_get_real_seconds() > req->rq_deadline ||
* 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),
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),
target_send_reply(req, 0, 0);
CDEBUG(D_INFO, "reorder BULK\n");
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);
cfs_fail_val ? : 3);
target_bulk_io(exp, desc);
RETURN(err_serious(-EPROTO));
}
RETURN(err_serious(-EPROTO));
}
- if (OBD_FAIL_CHECK(OBD_FAIL_OST_ENOSPC))
+ if (CFS_FAIL_CHECK(OBD_FAIL_OST_ENOSPC))
RETURN(err_serious(-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;
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))
- 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
rc = -EFAULT;
if (rc < 0) {
/* optionally use cfs_fail_val - 1 to select a specific OST on
* client was willing to wait, drop it. b=11330
*/
if (ktime_get_real_seconds() > req->rq_deadline ||
* 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),
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),
- 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.
out_commitrw:
/* calculate the expected actual write bytes (nob) for OFD stats.
idx = find_first_zero_bit(tgt->lut_client_bitmap, LR_MAX_CLIENTS);
repeat:
if (idx >= LR_MAX_CLIENTS ||
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);
CERROR("%s: no room for %u clients - fix LR_MAX_CLIENTS\n",
tgt->lut_obd->obd_name, idx);
RETURN(-EOVERFLOW);
tgt->lut_obd->obd_name, ted->ted_lr_idx, ted->ted_lr_off,
ted->ted_lcd->lcd_uuid, ted->ted_lcd->lcd_generation);
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);
RETURN(-ENOSPC);
rc = tgt_client_data_update(env, exp);
if (exp->exp_flags & OBD_OPT_FAILOVER)
RETURN(0);
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.
RETURN(0);
/* Make sure the server's last_transno is up to date.
OBD_FREE(lmi, sizeof(*lmi));
mutex_unlock(&lustre_mount_info_lock);
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);
}
lsi->lsi_server_started = 1;
mutex_unlock(&server_start_lock);
}
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) &&
- OBD_RACE(OBD_FAIL_OBD_STOP_MDS_RACE);
+ CFS_RACE(OBD_FAIL_OBD_STOP_MDS_RACE);
msleep(2 * MSEC_PER_SEC);
}
msleep(2 * MSEC_PER_SEC);
}
*/
obd->obd_force = 1;
class_manual_cleanup(obd);
*/
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)
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);
}
} else {
CERROR("no obd %s\n", lsi->lsi_svname);
ENTRY;
/* to simulate target mount race */
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) {
rc = lsi_prepare(lsi);
if (rc < 0) {
/* Step 3: write updates to other MDTs */
if (write_updates) {
struct llog_update_record *lur;
/* 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;
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;
set_current_state(TASK_UNINTERRUPTIBLE);
schedule_timeout(schedule_timeout(timeout));
cfs_fail_loc = 0;
struct sub_thandle *st;
ENTRY;
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);
RETURN(0);
top_multiple_thandle_dump(tmt, D_INFO);
if (!task_is_running(current))
schedule();
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));
}
set_current_state(TASK_UNINTERRUPTIBLE);
schedule_timeout(cfs_time_seconds(5));
}