RETURN(rc = -ENOSPC);
}
- OBD_ALLOC(batch, nr_saved * sizeof(struct ofd_object *));
+ OBD_ALLOC(batch, nr_saved * sizeof(*batch));
if (batch == NULL)
RETURN(-ENOMEM);
break;
}
- ofd_write_lock(env, fo);
batch[i] = fo;
}
info->fti_buf.lb_buf = &tmp;
fo = batch[i];
LASSERT(fo);
+ ofd_write_lock(env, fo);
+
/* Only the new created objects need to be recorded. */
if (ofd->ofd_osd->dd_record_fid_accessed) {
struct lfsck_req_local *lrl = &ofd_info(env)->fti_lrl;
rc = dt_create(env, next, &info->fti_attr, NULL,
&info->fti_dof, th);
+ ofd_write_unlock(env, fo);
if (rc < 0) {
if (i == 0)
GOTO(trans_stop, rc);
break;
}
LASSERT(ofd_object_exists(fo));
+ } else {
+ ofd_write_unlock(env, fo);
}
+
ofd_seq_last_oid_set(oseq, id + i);
}
out:
for (i = 0; i < nr_saved; i++) {
fo = batch[i];
- if (fo) {
- ofd_write_unlock(env, fo);
- ofd_object_put(env, fo);
- }
+ if (!fo)
+ continue;
+ ofd_object_put(env, fo);
}
- OBD_FREE(batch, nr_saved * sizeof(struct ofd_object *));
+ OBD_FREE(batch, nr_saved * sizeof(*batch));
CDEBUG((objects == 0 && rc == 0) ? D_ERROR : D_OTHER,
"created %d/%d objects: %d\n", objects, nr_saved, rc);
ff->ff_layout_version = oa->o_layout_version;
ff->ff_range = 0;
} else if (oa->o_layout_version > ff->ff_layout_version) {
- ff->ff_range = MAX(ff->ff_range,
- oa->o_layout_version - ff->ff_layout_version);
+ ff->ff_range = max_t(__u32, ff->ff_range,
+ oa->o_layout_version -
+ ff->ff_layout_version);
}
}
ENTRY;
- ofd_write_lock(env, fo);
if (!ofd_object_exists(fo))
- GOTO(unlock, rc = -ENOENT);
-
- if (la->la_valid & (LA_ATIME | LA_MTIME | LA_CTIME))
- tgt_fmd_update(info->fti_exp, &fo->ofo_header.loh_fid,
- info->fti_xid);
+ GOTO(out, rc = -ENOENT);
/* VBR: version recovery check */
rc = ofd_version_get_check(info, fo);
if (rc)
- GOTO(unlock, rc);
+ GOTO(out, rc);
rc = ofd_attr_handle_id(env, fo, la, 1 /* is_setattr */);
if (rc != 0)
- GOTO(unlock, rc);
-
- fl = ofd_object_ff_update(env, fo, oa, ff);
- if (fl < 0)
- GOTO(unlock, rc = fl);
+ GOTO(out, rc);
th = ofd_trans_create(env, ofd);
if (IS_ERR(th))
- GOTO(unlock, rc = PTR_ERR(th));
+ GOTO(out, rc = PTR_ERR(th));
rc = dt_declare_attr_set(env, ofd_object_child(fo), la, th);
if (rc)
GOTO(stop, rc);
- if (fl) {
- if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR1))
- ff->ff_parent.f_oid = cpu_to_le32(1UL << 31);
- else if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR2))
- le32_add_cpu(&ff->ff_parent.f_oid, -1);
-
- info->fti_buf.lb_buf = ff;
- info->fti_buf.lb_len = sizeof(*ff);
- rc = dt_declare_xattr_set(env, ofd_object_child(fo),
- &info->fti_buf, XATTR_NAME_FID, fl,
- th);
- if (rc)
- GOTO(stop, rc);
- }
+ info->fti_buf.lb_buf = ff;
+ info->fti_buf.lb_len = sizeof(*ff);
+ rc = dt_declare_xattr_set(env, ofd_object_child(fo), &info->fti_buf,
+ XATTR_NAME_FID, 0, th);
+ if (rc)
+ GOTO(stop, rc);
rc = ofd_trans_start(env, ofd, la->la_valid & LA_SIZE ? fo : NULL, th);
if (rc)
GOTO(stop, rc);
+ ofd_write_lock(env, fo);
+ if (!ofd_object_exists(fo))
+ GOTO(unlock, rc = -ENOENT);
+
+ /* serialize vs ofd_commitrw_write() */
+ if (la->la_valid & (LA_ATIME | LA_MTIME | LA_CTIME))
+ tgt_fmd_update(info->fti_exp, &fo->ofo_header.loh_fid,
+ info->fti_xid);
+
rc = dt_attr_set(env, ofd_object_child(fo), la, th);
if (rc)
- GOTO(stop, rc);
+ GOTO(unlock, rc);
+
+ fl = ofd_object_ff_update(env, fo, oa, ff);
+ if (fl < 0)
+ GOTO(unlock, rc = fl);
if (fl) {
- if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_NOPFID))
- GOTO(stop, rc);
+ if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR1))
+ ff->ff_parent.f_oid = cpu_to_le32(1UL << 31);
+ else if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR2))
+ le32_add_cpu(&ff->ff_parent.f_oid, -1);
+ else if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_NOPFID))
+ GOTO(unlock, rc);
info->fti_buf.lb_buf = ff;
info->fti_buf.lb_len = sizeof(*ff);
filter_fid_le_to_cpu(&fo->ofo_ff, ff, sizeof(*ff));
}
- GOTO(stop, rc);
+ GOTO(unlock, rc);
+unlock:
+ ofd_write_unlock(env, fo);
stop:
rc2 = ofd_trans_stop(env, ofd, th, rc);
if (rc2)
ofd_name(ofd), rc2);
if (!rc)
rc = rc2;
-
-unlock:
- ofd_write_unlock(env, fo);
-
+out:
return rc;
}
/* we support truncate, not punch yet */
LASSERT(end == OBD_OBJECT_EOF);
- ofd_write_lock(env, fo);
- if (la->la_valid & (LA_ATIME | LA_MTIME | LA_CTIME))
- tgt_fmd_update(info->fti_exp, &fo->ofo_header.loh_fid,
- info->fti_xid);
-
if (!ofd_object_exists(fo))
- GOTO(unlock, rc = -ENOENT);
+ GOTO(out, rc = -ENOENT);
if (ofd->ofd_lfsck_verify_pfid && oa->o_valid & OBD_MD_FLFID) {
rc = ofd_verify_ff(env, fo, oa);
if (rc != 0)
- GOTO(unlock, rc);
- }
-
- /* need to verify layout version */
- if (oa->o_valid & OBD_MD_LAYOUT_VERSION) {
- rc = ofd_verify_layout_version(env, fo, oa);
- if (rc)
- GOTO(unlock, rc);
-
- oa->o_valid &= ~OBD_MD_LAYOUT_VERSION;
+ GOTO(out, rc);
}
/* VBR: version recovery check */
rc = ofd_version_get_check(info, fo);
if (rc)
- GOTO(unlock, rc);
+ GOTO(out, rc);
rc = ofd_attr_handle_id(env, fo, la, 0 /* !is_setattr */);
if (rc != 0)
- GOTO(unlock, rc);
-
- fl = ofd_object_ff_update(env, fo, oa, ff);
- if (fl < 0)
- GOTO(unlock, rc = fl);
+ GOTO(out, rc);
th = ofd_trans_create(env, ofd);
if (IS_ERR(th))
- GOTO(unlock, rc = PTR_ERR(th));
+ GOTO(out, rc = PTR_ERR(th));
rc = dt_declare_attr_set(env, dob, la, th);
if (rc)
if (rc)
GOTO(stop, rc);
- if (fl) {
- if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR1))
- ff->ff_parent.f_oid = cpu_to_le32(1UL << 31);
- else if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR2))
- le32_add_cpu(&ff->ff_parent.f_oid, -1);
-
- info->fti_buf.lb_buf = ff;
- info->fti_buf.lb_len = sizeof(*ff);
- rc = dt_declare_xattr_set(env, ofd_object_child(fo),
- &info->fti_buf, XATTR_NAME_FID, fl,
- th);
- if (rc)
- GOTO(stop, rc);
- }
+ info->fti_buf.lb_buf = ff;
+ info->fti_buf.lb_len = sizeof(*ff);
+ rc = dt_declare_xattr_set(env, ofd_object_child(fo), &info->fti_buf,
+ XATTR_NAME_FID, 0, th);
+ if (rc)
+ GOTO(stop, rc);
rc = ofd_trans_start(env, ofd, fo, th);
if (rc)
GOTO(stop, rc);
+ ofd_write_lock(env, fo);
+
+ if (la->la_valid & (LA_ATIME | LA_MTIME | LA_CTIME))
+ tgt_fmd_update(info->fti_exp, &fo->ofo_header.loh_fid,
+ info->fti_xid);
+
+ if (!ofd_object_exists(fo))
+ GOTO(unlock, rc = -ENOENT);
+
+ /* need to verify layout version */
+ if (oa->o_valid & OBD_MD_LAYOUT_VERSION) {
+ rc = ofd_verify_layout_version(env, fo, oa);
+ if (rc)
+ GOTO(unlock, rc);
+
+ oa->o_valid &= ~OBD_MD_LAYOUT_VERSION;
+ }
+
rc = dt_punch(env, dob, start, OBD_OBJECT_EOF, th);
if (rc)
- GOTO(stop, rc);
+ GOTO(unlock, rc);
+
+ fl = ofd_object_ff_update(env, fo, oa, ff);
+ if (fl < 0)
+ GOTO(unlock, rc = fl);
rc = dt_attr_set(env, dob, la, th);
if (rc)
- GOTO(stop, rc);
+ GOTO(unlock, rc);
if (fl) {
- if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_NOPFID))
- GOTO(stop, rc);
+ if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR1))
+ ff->ff_parent.f_oid = cpu_to_le32(1UL << 31);
+ else if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR2))
+ le32_add_cpu(&ff->ff_parent.f_oid, -1);
+ else if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_NOPFID))
+ GOTO(unlock, rc);
+ info->fti_buf.lb_buf = ff;
+ info->fti_buf.lb_len = sizeof(*ff);
rc = dt_xattr_set(env, ofd_object_child(fo), &info->fti_buf,
XATTR_NAME_FID, fl, th);
if (!rc)
filter_fid_le_to_cpu(&fo->ofo_ff, ff, sizeof(*ff));
}
- GOTO(stop, rc);
+ GOTO(unlock, rc);
+unlock:
+ ofd_write_unlock(env, fo);
stop:
rc2 = ofd_trans_stop(env, ofd, th, rc);
if (rc2 != 0)
ofd_name(ofd), rc2);
if (!rc)
rc = rc2;
-unlock:
- ofd_write_unlock(env, fo);
-
+out:
return rc;
}
ENTRY;
- ofd_write_lock(env, fo);
if (!ofd_object_exists(fo))
- GOTO(unlock, rc = -ENOENT);
+ GOTO(out, rc = -ENOENT);
th = ofd_trans_create(env, ofd);
if (IS_ERR(th))
- GOTO(unlock, rc = PTR_ERR(th));
+ GOTO(out, rc = PTR_ERR(th));
rc = dt_declare_ref_del(env, ofd_object_child(fo), th);
if (rc < 0)
if (rc)
GOTO(stop, rc);
+ ofd_write_lock(env, fo);
+ if (!ofd_object_exists(fo))
+ GOTO(stop, rc = -ENOENT);
+
tgt_fmd_drop(ofd_info(env)->fti_exp, &fo->ofo_header.loh_fid);
dt_ref_del(env, ofd_object_child(fo), th);
dt_destroy(env, ofd_object_child(fo), th);
+ ofd_write_unlock(env, fo);
+
stop:
rc2 = ofd_trans_stop(env, ofd, th, rc);
if (rc2)
ofd_name(ofd), rc2);
if (!rc)
rc = rc2;
-unlock:
- ofd_write_unlock(env, fo);
+out:
RETURN(rc);
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff