LU-4975 ofd: documenting ofd_dev.c

[fs/lustre-release.git] / lustre / ofd / ofd_io.c

diff --git a/lustre/ofd/ofd_io.c b/lustre/ofd/ofd_io.c
index 6b2d48f..d8bef11 100644 (file)
--- a/lustre/ofd/ofd_io.c
+++ b/lustre/ofd/ofd_io.c
@@ -150,7 +150,7 @@ static int ofd_inconsistency_verification_main(void *args)
                GOTO(out, rc = -ENOMEM);
 
        lr->lr_event = LE_PAIRS_VERIFY;
-       lr->lr_active = LT_LAYOUT;
+       lr->lr_active = LFSCK_TYPE_LAYOUT;
 
        spin_lock(&ofd->ofd_inconsistency_lock);
        while (1) {
@@ -270,16 +270,8 @@ static void ofd_add_inconsistency_item(const struct lu_env *env,
        bool                             wakeup = false;
 
        OBD_ALLOC_PTR(oii);
-       if (oii == NULL) {
-               CERROR("%s: cannot alloc memory for verify OST-object "
-                      "consistency for "DFID", client given PFID "DFID
-                      ", local stored PFID "DFID"\n",
-                      ofd_name(ofd), PFID(&fo->ofo_header.loh_fid),
-                      oa->o_parent_seq, oa->o_parent_oid, oa->o_stripe_idx,
-                      PFID(&fo->ofo_pfid));
-
+       if (oii == NULL)
                return;
-       }
 
        INIT_LIST_HEAD(&oii->oii_list);
        lu_object_get(&fo->ofo_obj.do_lu);
@@ -807,9 +799,8 @@ static int ofd_soft_sync_cb_add(struct thandle *th, struct obd_export *exp)
 
        dcb = &ossc->ossc_cb;
        dcb->dcb_func = ofd_cb_soft_sync;
-       CFS_INIT_LIST_HEAD(&dcb->dcb_linkage);
-       strncpy(dcb->dcb_name, "ofd_cb_soft_sync", MAX_COMMIT_CB_STR_LEN);
-       dcb->dcb_name[MAX_COMMIT_CB_STR_LEN - 1] = '\0';
+       INIT_LIST_HEAD(&dcb->dcb_linkage);
+       strlcpy(dcb->dcb_name, "ofd_cb_soft_sync", sizeof(dcb->dcb_name));
 
        rc = dt_trans_cb_add(th, dcb);
        if (rc) {
@@ -1025,8 +1016,8 @@ int ofd_commitrw(const struct lu_env *env, int cmd, struct obd_export *exp,
                        ost_fid_build_resid(fid, &info->fti_resid);
                        rs = ldlm_resource_get(ns, NULL, &info->fti_resid,
                                               LDLM_EXTENT, 0);
-                       if (rs != NULL) {
-                               ns->ns_lvbo->lvbo_update(rs, NULL, 1);
+                       if (!IS_ERR(rs)) {
+                               ldlm_res_lvbo_update(rs, NULL, 1);
                                ldlm_resource_putref(rs);
                        }
                }