LU-12610 osd: remove OBD_ -> CFS_ macros

Remove OBD macros that are simply redefinitions
of CFS macros.

The CFS macros are provided by libcfs.h, so add this
header where needed.

Test-Parameters: trivial
Signed-off-by: Timothy Day <timday@amazon.com>
Signed-off-by: Ben Evans <beevans@whamcloud.com>
Change-Id: Ia7f7ba611b98500ecf06137159649949a621476f
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50805
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Arshad Hussain <arshad.hussain@aeoncomputing.com>
Reviewed-by: Neil Brown <neilb@suse.de>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/osd-ldiskfs/osd_compat.c b/lustre/osd-ldiskfs/osd_compat.c
index eb94da2..97fb9c0 100644 (file)
--- a/lustre/osd-ldiskfs/osd_compat.c
+++ b/lustre/osd-ldiskfs/osd_compat.c
@@ -44,9 +44,9 @@
 
 /*
  * struct OBD_{ALLOC,FREE}*()
- * OBD_FAIL_CHECK
  */
 #include <obd_support.h>
+#include <libcfs/libcfs.h>
 
 #include "osd_internal.h"
 #include "osd_oi.h"
@@ -336,7 +336,7 @@ int osd_add_to_remote_parent(const struct lu_env *env, struct osd_device *osd,
        struct dentry *parent;
        int rc;
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_NO_AGENTENT))
+       if (CFS_FAIL_CHECK(OBD_FAIL_LFSCK_NO_AGENTENT))
                RETURN(0);
 
        /*
@@ -871,7 +871,7 @@ static int osd_obj_add_entry(struct osd_thread_info *info,
 
        ENTRY;
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OSD_COMPAT_NO_ENTRY))
+       if (CFS_FAIL_CHECK(OBD_FAIL_OSD_COMPAT_NO_ENTRY))
                RETURN(0);
 
        LASSERT(th != NULL);
@@ -898,7 +898,7 @@ static int osd_obj_add_entry(struct osd_thread_info *info,
        child->d_parent = dir;
        child->d_inode = inode;
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OSD_COMPAT_INVALID_ENTRY))
+       if (CFS_FAIL_CHECK(OBD_FAIL_OSD_COMPAT_INVALID_ENTRY))
                inode->i_ino++;
 
        dquot_initialize(dir->d_inode);

diff --git a/lustre/osd-ldiskfs/osd_handler.c b/lustre/osd-ldiskfs/osd_handler.c
index c725934..88105ca 100644 (file)
--- a/lustre/osd-ldiskfs/osd_handler.c
+++ b/lustre/osd-ldiskfs/osd_handler.c
@@ -56,9 +56,9 @@
 #undef ENTRY
 /*
  * struct OBD_{ALLOC,FREE}*()
- * OBD_FAIL_CHECK
  */
 #include <obd_support.h>
+#include <libcfs/libcfs.h>
 /* struct ptlrpc_thread */
 #include <lustre_net.h>
 #include <lustre_fid.h>
@@ -1136,7 +1136,7 @@ static int osd_fid_lookup(const struct lu_env *env, struct osd_object *obj,
        LASSERT(info);
        oic = &info->oti_cache;
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_SRV_ENOENT))
+       if (CFS_FAIL_CHECK(OBD_FAIL_SRV_ENOENT))
                RETURN(-ENOENT);
 
        /*
@@ -1163,7 +1163,7 @@ static int osd_fid_lookup(const struct lu_env *env, struct osd_object *obj,
                RETURN(-EINPROGRESS);
 
        stale = fid_in_scrub_list(scrub, &scrub->os_stale_items, fid);
-       if (stale && OBD_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_STALE))
+       if (stale && CFS_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_STALE))
                RETURN(-ESTALE);
 
        /*
@@ -1209,7 +1209,7 @@ iget:
                goto check_lma;
        }
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_STALE))
+       if (CFS_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_STALE))
                goto trigger;
 
        result = PTR_ERR(inode);
@@ -1481,7 +1481,7 @@ static int osd_object_init(const struct lu_env *env, struct lu_object *l,
 
        LINVRNT(osd_invariant(obj));
 
-       if (OBD_FAIL_PRECHECK(OBD_FAIL_MDS_LLOG_UMOUNT_RACE) &&
+       if (CFS_FAIL_PRECHECK(OBD_FAIL_MDS_LLOG_UMOUNT_RACE) &&
            cfs_fail_val == 2) {
                struct osd_thread_info *info = osd_oti_get(env);
                struct osd_idmap_cache *oic = &info->oti_cache;
@@ -2046,7 +2046,7 @@ static int osd_trans_start(const struct lu_env *env, struct dt_device *d,
                        oh->ot_credits = osd_transaction_size(dev);
        }
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OSD_TXN_START))
+       if (CFS_FAIL_CHECK(OBD_FAIL_OSD_TXN_START))
                GOTO(out, rc = -EIO);
 
         /*
@@ -3252,7 +3252,7 @@ static int osd_attr_set(const struct lu_env *env,
 
        osd_trans_exec_op(env, handle, OSD_OT_ATTR_SET);
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OSD_FID_MAPPING) &&
+       if (CFS_FAIL_CHECK(OBD_FAIL_OSD_FID_MAPPING) &&
            !osd_obj2dev(obj)->od_is_ost) {
                struct osd_thread_info *oti = osd_oti_get(env);
                const struct lu_fid *fid0 = lu_object_fid(&dt->do_lu);
@@ -3309,7 +3309,7 @@ static int osd_attr_set(const struct lu_env *env,
         */
        if (!(LDISKFS_I(obj->oo_inode)->i_flags & LDISKFS_ENCRYPT_FL) &&
            attr->la_flags & LUSTRE_ENCRYPT_FL && osd->od_is_ost &&
-           !OBD_FAIL_CHECK(OBD_FAIL_LFSCK_NO_ENCFLAG)) {
+           !CFS_FAIL_CHECK(OBD_FAIL_LFSCK_NO_ENCFLAG)) {
                struct lu_buf buf;
 
                /* use a dummy enc ctx, fine with e2fsprogs */
@@ -3869,7 +3869,7 @@ static int osd_declare_destroy(const struct lu_env *env, struct dt_object *dt,
         * Recycle idle OI leaf may cause additional three OI blocks
         * to be changed.
         */
-       if (!OBD_FAIL_CHECK(OBD_FAIL_LFSCK_LOST_MDTOBJ2))
+       if (!CFS_FAIL_CHECK(OBD_FAIL_LFSCK_LOST_MDTOBJ2))
                osd_trans_declare_op(env, oh, OSD_OT_DELETE,
                             osd_dto_credits_noquota[DTO_INDEX_DELETE] + 3);
        /* one less inode */
@@ -3937,7 +3937,7 @@ static int osd_destroy(const struct lu_env *env, struct dt_object *dt,
 
        ldiskfs_set_inode_state(inode, LDISKFS_STATE_LUSTRE_DESTROY);
 
-       if (!OBD_FAIL_CHECK(OBD_FAIL_LFSCK_LOST_MDTOBJ2))
+       if (!CFS_FAIL_CHECK(OBD_FAIL_LFSCK_LOST_MDTOBJ2))
                result = osd_oi_delete(osd_oti_get(env), osd, fid,
                                       oh->ot_handle, OI_CHECK_FLD);
 
@@ -3971,10 +3971,10 @@ int osd_ea_fid_set(struct osd_thread_info *info, struct inode *inode,
 
        ENTRY;
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_FID_INLMA))
+       if (CFS_FAIL_CHECK(OBD_FAIL_FID_INLMA))
                RETURN(0);
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OSD_OST_EA_FID_SET))
+       if (CFS_FAIL_CHECK(OBD_FAIL_OSD_OST_EA_FID_SET))
                rc = -ENOMEM;
 
        lustre_loa_init(loa, fid, compat, incompat);
@@ -4042,7 +4042,7 @@ static void osd_get_ldiskfs_dirent_param(struct ldiskfs_dentry_param *param,
                                         const struct lu_fid *fid)
 {
        if (!fid_is_namespace_visible(fid) ||
-           OBD_FAIL_CHECK(OBD_FAIL_FID_IGIF)) {
+           CFS_FAIL_CHECK(OBD_FAIL_FID_IGIF)) {
                param->edp_magic = 0;
                return;
        }
@@ -4089,7 +4089,7 @@ static int osd_add_dot_dotdot_internal(struct osd_thread_info *info,
        __u32 saved_nlink = dir->i_nlink;
        int rc;
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OSD_DOTDOT_ENOSPC))
+       if (CFS_FAIL_CHECK(OBD_FAIL_OSD_DOTDOT_ENOSPC))
                return -ENOSPC;
 
        dot_dot_ldp = (struct ldiskfs_dentry_param *)info->oti_ldp2;
@@ -4500,7 +4500,7 @@ static int osd_ref_del(const struct lu_env *env, struct dt_object *dt,
        LASSERT(osd_is_write_locked(env, obj));
        LASSERT(th != NULL);
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OSD_REF_DEL))
+       if (CFS_FAIL_CHECK(OBD_FAIL_OSD_REF_DEL))
                return -EIO;
 
        oh = container_of(th, struct osd_thandle, ot_super);
@@ -5902,7 +5902,7 @@ static int __osd_ea_add_rec(struct osd_thread_info *info,
        dquot_initialize(pobj->oo_inode);
        rc = osd_ldiskfs_add_entry(info, osd_obj2dev(pobj), oth->ot_handle,
                                   child, cinode, hlock);
-       if (rc == 0 && OBD_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_TYPE)) {
+       if (rc == 0 && CFS_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_TYPE)) {
                struct ldiskfs_dir_entry_2      *de;
                struct buffer_head              *bh;
                int                              rc1;
@@ -5976,7 +5976,7 @@ static int osd_add_dot_dotdot(struct osd_thread_info *info,
                                                dot_dot_fid, NULL, th);
                }
 
-               if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_PARENT)) {
+               if (CFS_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_PARENT)) {
                        struct lu_fid tfid = *dot_dot_fid;
 
                        tfid.f_oid--;
@@ -6031,7 +6031,7 @@ static int osd_ea_add_rec(const struct lu_env *env, struct osd_object *pobj,
                        down_write(&pobj->oo_ext_idx_sem);
                }
 
-               if (OBD_FAIL_CHECK(OBD_FAIL_FID_INDIR)) {
+               if (CFS_FAIL_CHECK(OBD_FAIL_FID_INDIR)) {
                        struct lu_fid *tfid = &info->oti_fid;
 
                        *tfid = *fid;
@@ -6354,7 +6354,7 @@ static int osd_ea_lookup_rec(const struct lu_env *env, struct osd_object *obj,
                struct osd_device *dev = osd_obj2dev(obj);
 
                ino = le32_to_cpu(de->inode);
-               if (OBD_FAIL_CHECK(OBD_FAIL_FID_LOOKUP)) {
+               if (CFS_FAIL_CHECK(OBD_FAIL_FID_LOOKUP)) {
                        brelse(bh);
                        rc = osd_fail_fid_lookup(oti, dev, fid, ino);
                        GOTO(out, rc);
@@ -7749,7 +7749,7 @@ static inline int osd_it_ea_rec(const struct lu_env *env,
                                rc = osd_get_pfid_from_linkea(env, obj, fid);
                        } else {
                                if (is_dotdot == false &&
-                                   OBD_FAIL_CHECK(OBD_FAIL_FID_LOOKUP))
+                                   CFS_FAIL_CHECK(OBD_FAIL_FID_LOOKUP))
                                        RETURN(-ENOENT);
 
                                rc = osd_ea_fid_get(env, obj, ino, fid, id);

diff --git a/lustre/osd-ldiskfs/osd_io.c b/lustre/osd-ldiskfs/osd_io.c
index 40d6a00..e0338e9 100644 (file)
--- a/lustre/osd-ldiskfs/osd_io.c
+++ b/lustre/osd-ldiskfs/osd_io.c
@@ -49,9 +49,9 @@
 
 /*
  * struct OBD_{ALLOC,FREE}*()
- * OBD_FAIL_CHECK
  */
 #include <obd_support.h>
+#include <libcfs/libcfs.h>
 
 #include "osd_internal.h"
 
@@ -411,7 +411,7 @@ static int osd_bio_integrity_handle(struct osd_device *osd, struct bio *bio,
 
        /* Verify and inject fault only when writing */
        if (iobuf->dr_rw == 1) {
-               if (unlikely(OBD_FAIL_CHECK(OBD_FAIL_OST_INTEGRITY_CMP))) {
+               if (unlikely(CFS_FAIL_CHECK(OBD_FAIL_OST_INTEGRITY_CMP))) {
                        rc = osd_bio_integrity_compare(bio, sb->s_bdev, iobuf,
                                                       start_page_idx);
                        if (rc)
@@ -521,7 +521,7 @@ static int osd_do_bio(struct osd_device *osd, struct inode *inode,
 
        ENTRY;
 
-       fault_inject = OBD_FAIL_CHECK(OBD_FAIL_OST_INTEGRITY_FAULT);
+       fault_inject = CFS_FAIL_CHECK(OBD_FAIL_OST_INTEGRITY_FAULT);
        LASSERT(iobuf->dr_npages == npages);
 
        integrity_enabled = bdev_integrity_enabled(bdev, iobuf->dr_rw);
@@ -1232,7 +1232,7 @@ cont_map:
                                GOTO(cleanup, rc = -EAGAIN);
                        }
 
-                       if (OBD_FAIL_CHECK(OBD_FAIL_OST_RESTART_IO))
+                       if (CFS_FAIL_CHECK(OBD_FAIL_OST_RESTART_IO))
                                oh->oh_declared_ext = 0;
                        else
                                oh->oh_declared_ext--;
@@ -1725,7 +1725,7 @@ static int osd_write_commit(const struct lu_env *env, struct dt_object *dt,
 
        osd_trans_exec_op(env, thandle, OSD_OT_WRITE);
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OST_MAPBLK_ENOSPC)) {
+       if (CFS_FAIL_CHECK(OBD_FAIL_OST_MAPBLK_ENOSPC)) {
                rc = -ENOSPC;
        } else if (iobuf->dr_npages > 0) {
                rc = osd_ldiskfs_map_inode_pages(inode, iobuf, osd,
@@ -1793,7 +1793,7 @@ static int osd_read_prep(const struct lu_env *env, struct dt_object *dt,
                lnb[i].lnb_rc = lnb[i].lnb_len;
 
                /* Bypass disk read if fail_loc is set properly */
-               if (OBD_FAIL_CHECK_QUIET(OBD_FAIL_OST_FAKE_RW))
+               if (CFS_FAIL_CHECK_QUIET(OBD_FAIL_OST_FAKE_RW))
                        SetPageUptodate(lnb[i].lnb_page);
 
                if (PageUptodate(lnb[i].lnb_page)) {
@@ -2932,7 +2932,7 @@ void osd_execute_truncate(struct osd_object *obj)
        __u64 size;
 
        /* simulate crash before (in the middle) of delayed truncate */
-       if (OBD_FAIL_CHECK(OBD_FAIL_OSD_FAIL_AT_TRUNCATE)) {
+       if (CFS_FAIL_CHECK(OBD_FAIL_OSD_FAIL_AT_TRUNCATE)) {
                struct ldiskfs_inode_info *ei = LDISKFS_I(inode);
                struct ldiskfs_sb_info *sbi = LDISKFS_SB(inode->i_sb);
 

diff --git a/lustre/osd-ldiskfs/osd_oi.c b/lustre/osd-ldiskfs/osd_oi.c
index fe58e63..cc69fe2 100644 (file)
--- a/lustre/osd-ldiskfs/osd_oi.c
+++ b/lustre/osd-ldiskfs/osd_oi.c
@@ -41,10 +41,10 @@
 
 /*
  * struct OBD_{ALLOC,FREE}*()
- * OBD_FAIL_CHECK
  */
 #include <obd.h>
 #include <obd_support.h>
+#include <libcfs/libcfs.h>
 
 /* fid_cpu_to_be() */
 #include <lustre_fid.h>

diff --git a/lustre/osd-ldiskfs/osd_scrub.c b/lustre/osd-ldiskfs/osd_scrub.c
index 8a9f188..b3d5712 100644 (file)
--- a/lustre/osd-ldiskfs/osd_scrub.c
+++ b/lustre/osd-ldiskfs/osd_scrub.c
@@ -393,7 +393,7 @@ osd_scrub_check_update(struct osd_thread_info *info, struct osd_device *dev,
        if (scrub->os_in_prior) {
                oii = list_entry(oic, struct osd_inconsistent_item,
                                 oii_cache);
-               if (OBD_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_STALE))
+               if (CFS_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_STALE))
                        GOTO(out, rc = -ESTALE);
        }
 
@@ -424,7 +424,7 @@ osd_scrub_check_update(struct osd_thread_info *info, struct osd_device *dev,
        }
 
        if ((val == SCRUB_NEXT_NOLMA) &&
-           (!scrub->os_convert_igif || OBD_FAIL_CHECK(OBD_FAIL_FID_NOLMA)))
+           (!scrub->os_convert_igif || CFS_FAIL_CHECK(OBD_FAIL_FID_NOLMA)))
                GOTO(out, rc = 0);
 
        if ((oii != NULL && oii->oii_insert) || (val == SCRUB_NEXT_NOLMA)) {
@@ -536,7 +536,7 @@ out:
                               lid->oii_gen, rc);
                }
        } else {
-               if (!oii && !OBD_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_STALE)) {
+               if (!oii && !CFS_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_STALE)) {
                        osd_scrub_oi_resurrect(scrub, fid);
                        CDEBUG(D_LFSCK,
                               "%s: resurrect OI "DFID" -> %u/%u\n",
@@ -791,21 +791,21 @@ static int osd_scrub_next(struct osd_thread_info *info, struct osd_device *dev,
        struct osd_inode_id *lid;
        int rc;
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_DELAY) && cfs_fail_val > 0)
+       if (CFS_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_DELAY) && cfs_fail_val > 0)
                wait_var_event_timeout(
                        scrub,
                        !list_empty(&scrub->os_inconsistent_items) ||
                        kthread_should_stop(),
                        cfs_time_seconds(cfs_fail_val));
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_CRASH)) {
+       if (CFS_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_CRASH)) {
                spin_lock(&scrub->os_lock);
                scrub->os_running = 0;
                spin_unlock(&scrub->os_lock);
                return SCRUB_NEXT_CRASH;
        }
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_FATAL))
+       if (CFS_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_FATAL))
                return SCRUB_NEXT_FATAL;
 
        if (kthread_should_stop())
@@ -1100,7 +1100,7 @@ static int osd_inode_iteration(struct osd_thread_info *info,
                        }
 
 wait:
-                       if (OBD_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_DELAY) &&
+                       if (CFS_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_DELAY) &&
                            cfs_fail_val > 0)
                                continue;
 

diff --git a/lustre/osd-zfs/osd_handler.c b/lustre/osd-zfs/osd_handler.c
index d2db32a..fb148f1 100644 (file)
--- a/lustre/osd-zfs/osd_handler.c
+++ b/lustre/osd-zfs/osd_handler.c
@@ -208,7 +208,7 @@ static int osd_trans_start(const struct lu_env *env, struct dt_device *d,
                RETURN(rc);
        }
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OSD_TXN_START))
+       if (CFS_FAIL_CHECK(OBD_FAIL_OSD_TXN_START))
                /* Unlike ldiskfs, ZFS checks for available space and returns
                 * -ENOSPC when assigning txg */
                RETURN(-EIO);

diff --git a/lustre/osd-zfs/osd_index.c b/lustre/osd-zfs/osd_index.c
index 8b32422..3ae036a 100644 (file)
--- a/lustre/osd-zfs/osd_index.c
+++ b/lustre/osd-zfs/osd_index.c
@@ -711,7 +711,7 @@ static int osd_create_agent_object(const struct lu_env *env,
        int rc = 0;
        ENTRY;
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_NO_AGENTOBJ))
+       if (CFS_FAIL_CHECK(OBD_FAIL_LFSCK_NO_AGENTOBJ))
                RETURN(0);
 
        rc = -nvlist_alloc(&nvbuf, NV_UNIQUE_NAME, KM_SLEEP);
@@ -780,7 +780,7 @@ int osd_add_to_remote_parent(const struct lu_env *env,
        int rc;
        ENTRY;
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_NO_AGENTENT))
+       if (CFS_FAIL_CHECK(OBD_FAIL_LFSCK_NO_AGENTENT))
                RETURN(0);
 
        rc = osd_xattr_get_internal(env, obj, &buf, XATTR_NAME_LMA, &size);
@@ -1066,7 +1066,7 @@ static int osd_dir_insert(const struct lu_env *env, struct dt_object *dt,
                                GOTO(out, rc = 0);
                        } else if (name[1] == '.' && name[2] == 0) {
                                uint64_t dnode = idc->oic_dnode;
-                               if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_PARENT))
+                               if (CFS_FAIL_CHECK(OBD_FAIL_LFSCK_BAD_PARENT))
                                        dnode--;
 
                                /* update parent dnode in the child.
@@ -1081,12 +1081,12 @@ static int osd_dir_insert(const struct lu_env *env, struct dt_object *dt,
                zde->lzd_reg.zde_dnode = idc->oic_dnode;
        }
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_FID_INDIR))
+       if (CFS_FAIL_CHECK(OBD_FAIL_FID_INDIR))
                zde->lzd_fid.f_ver = ~0;
 
        /* The logic is not related with IGIF, just re-use the fail_loc value
         * to be consistent with ldiskfs case, then share the same test logic */
-       if (OBD_FAIL_CHECK(OBD_FAIL_FID_IGIF))
+       if (CFS_FAIL_CHECK(OBD_FAIL_FID_IGIF))
                num = 1;
 
        /* Insert (key,oid) into ZAP */
@@ -1563,7 +1563,7 @@ static int osd_dir_it_rec(const struct lu_env *env, const struct dt_it *di,
                        GOTO(pack_attr, rc = 0);
        }
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_FID_LOOKUP))
+       if (CFS_FAIL_CHECK(OBD_FAIL_FID_LOOKUP))
                RETURN(-ENOENT);
 
        rc = osd_get_fid_by_oid(env, osd, zde->lzd_reg.zde_dnode, fid);

diff --git a/lustre/osd-zfs/osd_io.c b/lustre/osd-zfs/osd_io.c
index 34441b0..0c90712 100644 (file)
--- a/lustre/osd-zfs/osd_io.c
+++ b/lustre/osd-zfs/osd_io.c
@@ -968,7 +968,7 @@ static int osd_write_commit(const struct lu_env *env, struct dt_object *dt,
            osd->od_readcache_max_filesize)
                drop_cache = 1;
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OST_MAPBLK_ENOSPC))
+       if (CFS_FAIL_CHECK(OBD_FAIL_OST_MAPBLK_ENOSPC))
                RETURN(-ENOSPC);
 
        /* if la_size is already bigger than specified user_size,

diff --git a/lustre/osd-zfs/osd_object.c b/lustre/osd-zfs/osd_object.c
index 0b2753a..778b822 100644 (file)
--- a/lustre/osd-zfs/osd_object.c
+++ b/lustre/osd-zfs/osd_object.c
@@ -1296,7 +1296,7 @@ static int osd_attr_set(const struct lu_env *env, struct dt_object *dt,
           transaction group. */
        LASSERT(oh->ot_tx->tx_txg != 0);
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OSD_FID_MAPPING) && !osd->od_is_ost) {
+       if (CFS_FAIL_CHECK(OBD_FAIL_OSD_FID_MAPPING) && !osd->od_is_ost) {
                struct zpl_direntry *zde = &info->oti_zde.lzd_reg;
                char *buf = info->oti_str;
                dnode_t *zdn = NULL;
@@ -2028,10 +2028,10 @@ static int osd_create(const struct lu_env *env, struct dt_object *dt,
        zapid = osd_get_name_n_idx(env, osd, fid, buf,
                                   sizeof(info->oti_str), &zdn);
        if (CFS_FAIL_CHECK(OBD_FAIL_OSD_NO_OI_ENTRY) ||
-           (osd->od_is_ost && OBD_FAIL_CHECK(OBD_FAIL_OSD_COMPAT_NO_ENTRY)))
+           (osd->od_is_ost && CFS_FAIL_CHECK(OBD_FAIL_OSD_COMPAT_NO_ENTRY)))
                goto skip_add;
 
-       if (osd->od_is_ost && OBD_FAIL_CHECK(OBD_FAIL_OSD_COMPAT_INVALID_ENTRY))
+       if (osd->od_is_ost && CFS_FAIL_CHECK(OBD_FAIL_OSD_COMPAT_INVALID_ENTRY))
                zde->zde_dnode++;
 
        rc = osd_zap_add(osd, zapid, zdn, buf, 8, 1, zde, oh->ot_tx);

diff --git a/lustre/osd-zfs/osd_oi.c b/lustre/osd-zfs/osd_oi.c
index 75a64ac..18aaca9 100644 (file)
--- a/lustre/osd-zfs/osd_oi.c
+++ b/lustre/osd-zfs/osd_oi.c
@@ -668,7 +668,7 @@ int osd_fid_lookup(const struct lu_env *env, struct osd_device *dev,
        int                     rc = 0;
        ENTRY;
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_SRV_ENOENT))
+       if (CFS_FAIL_CHECK(OBD_FAIL_SRV_ENOENT))
                RETURN(-ENOENT);
 
        LASSERT(!fid_is_acct(fid));

diff --git a/lustre/osd-zfs/osd_scrub.c b/lustre/osd-zfs/osd_scrub.c
index 2ce5992..3f18a4f 100644 (file)
--- a/lustre/osd-zfs/osd_scrub.c
+++ b/lustre/osd-zfs/osd_scrub.c
@@ -327,7 +327,7 @@ static int osd_scrub_next(const struct lu_env *env, struct osd_device *dev,
        int rc = 0;
        ENTRY;
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_DELAY) && cfs_fail_val > 0) {
+       if (CFS_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_DELAY) && cfs_fail_val > 0) {
                wait_var_event_timeout(
                        scrub,
                        !list_empty(&scrub->os_inconsistent_items) ||
@@ -338,14 +338,14 @@ static int osd_scrub_next(const struct lu_env *env, struct osd_device *dev,
                        RETURN(SCRUB_NEXT_EXIT);
        }
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_CRASH)) {
+       if (CFS_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_CRASH)) {
                spin_lock(&scrub->os_lock);
                scrub->os_running = 0;
                spin_unlock(&scrub->os_lock);
                RETURN(SCRUB_NEXT_CRASH);
        }
 
-       if (OBD_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_FATAL))
+       if (CFS_FAIL_CHECK(OBD_FAIL_OSD_SCRUB_FATAL))
                RETURN(SCRUB_NEXT_FATAL);
 
 again: