reclen = llog_data_len(LLOG_CHANGELOG_HDR_SZ +
changelog_rec_offset(clf_flags & CLF_SUPPORTED,
xflags & CLFE_SUPPORTED));
- buf = lu_buf_check_and_alloc(&mdd_env_info(env)->mti_big_buf, reclen);
+ buf = lu_buf_check_and_alloc(&mdd_env_info(env)->mti_chlg_buf, reclen);
if (buf->lb_buf == NULL)
RETURN(-ENOMEM);
rec = buf->lb_buf;
if (mrd->mrd_obj)
vic = md2mdd_obj(mrd->mrd_obj);
- if (vic) {
- /* don't use the same file to save the splitted mirror */
- rc = lu_fid_cmp(mdd_object_fid(obj), mdd_object_fid(vic));
- if (rc == 0)
- RETURN(-EPERM);
-
- if (rc > 0) {
- mdd_write_lock(env, obj, DT_TGT_CHILD);
- mdd_write_lock(env, vic, DT_TGT_CHILD);
- } else {
- mdd_write_lock(env, vic, DT_TGT_CHILD);
- mdd_write_lock(env, obj, DT_TGT_CHILD);
- }
- } else {
- mdd_write_lock(env, obj, DT_TGT_CHILD);
- }
-
handle = mdd_trans_create(env, mdd);
if (IS_ERR(handle))
- GOTO(unlock, rc = PTR_ERR(handle));
+ RETURN(PTR_ERR(handle));
/* get EA of mirrored file */
memset(buf_save, 0, sizeof(*buf));
rc = mdd_stripe_get(env, obj, buf_save, XATTR_NAME_LOV);
if (rc < 0)
- GOTO(out, rc);
+ GOTO(stop, rc);
lcm = buf_save->lb_buf;
if (le32_to_cpu(lcm->lcm_magic) != LOV_MAGIC_COMP_V1)
- GOTO(out, rc = -EINVAL);
+ GOTO(stop, rc = -EINVAL);
/**
* Extract the mirror with specified mirror id, and store the splitted
memset(buf_vic, 0, sizeof(*buf_vic));
rc = mdd_split_ea(lcm, mrd->mrd_mirror_id, buf, buf_vic);
if (rc < 0)
- GOTO(out, rc);
+ GOTO(stop, rc);
/**
* @buf stores layout w/o the specified mirror, @buf_vic stores the
* splitted mirror
rc = mdd_declare_xattr_set(env, mdd, obj, buf, XATTR_NAME_LOV,
LU_XATTR_SPLIT, handle);
if (rc)
- GOTO(out_restore, rc);
+ GOTO(stop, rc);
/* declare vic set splitted layout in @buf_vic */
rc = mdd_declare_xattr_set(env, mdd, vic, buf_vic,
XATTR_NAME_LOV, LU_XATTR_SPLIT,
handle);
if (rc)
- GOTO(out_restore, rc);
+ GOTO(stop, rc);
} else {
/**
* declare delete mirror objects in @buf_vic, will change obj's
XATTR_NAME_LOV, LU_XATTR_PURGE,
handle);
if (rc)
- GOTO(out_restore, rc);
+ GOTO(stop, rc);
/* declare obj set remaining layout in @buf */
rc = mdd_declare_xattr_set(env, mdd, obj, buf,
XATTR_NAME_LOV, LU_XATTR_SPLIT,
handle);
if (rc)
- GOTO(out_restore, rc);
+ GOTO(stop, rc);
}
rc = mdd_trans_start(env, mdd, handle);
if (rc)
- GOTO(out_restore, rc);
+ GOTO(stop, rc);
+
+ if (vic) {
+ /* don't use the same file to save the splitted mirror */
+ rc = lu_fid_cmp(mdd_object_fid(obj), mdd_object_fid(vic));
+ if (rc == 0)
+ GOTO(stop, rc = -EPERM);
+
+ if (rc > 0) {
+ mdd_write_lock(env, obj, DT_TGT_CHILD);
+ mdd_write_lock(env, vic, DT_TGT_CHILD);
+ } else {
+ mdd_write_lock(env, vic, DT_TGT_CHILD);
+ mdd_write_lock(env, obj, DT_TGT_CHILD);
+ }
+ } else {
+ mdd_write_lock(env, obj, DT_TGT_CHILD);
+ }
/* set obj's layout in @buf */
rc = mdo_xattr_set(env, obj, buf, XATTR_NAME_LOV, LU_XATTR_REPLACE,
handle);
if (rc)
- GOTO(out_restore, rc);
+ GOTO(unlock, rc);
if (vic) {
/* set vic's layout in @buf_vic */
rc = mdd_changelog_data_store(env, mdd, CL_LAYOUT, 0, obj, handle,
NULL);
if (rc)
- GOTO(out, rc);
+ GOTO(out_restore, rc);
if (vic) {
rc = mdd_changelog_data_store(env, mdd, CL_LAYOUT, 0, vic,
handle, NULL);
if (rc)
- GOTO(out, rc);
+ GOTO(out_restore, rc);
}
out_restore:
PFID(mdd_object_fid(obj)), rc);
}
-out:
+unlock:
+ mdd_write_unlock(env, obj);
+ if (vic)
+ mdd_write_unlock(env, vic);
+stop:
rc = mdd_trans_stop(env, mdd, rc, handle);
/* Truncate local DOM data if all went well */
if (!rc && dom_stripe)
mdd_dom_data_truncate(env, mdd, obj);
-unlock:
- mdd_write_unlock(env, obj);
- if (vic)
- mdd_write_unlock(env, vic);
lu_buf_free(buf_save);
lu_buf_free(buf);
lu_buf_free(buf_vic);
lustre_som_swab(som);
if (som->lsa_valid & SOM_FL_STRICT)
fl = LU_XATTR_REPLACE;
+
+ if (mlc->mlc_opc == MD_LAYOUT_WRITE &&
+ mlc->mlc_intent->li_extent.e_end > som->lsa_size) {
+ som->lsa_size = mlc->mlc_intent->li_extent.e_end + 1;
+ fl = LU_XATTR_REPLACE;
+ }
}
rc = mdd_declare_layout_change(env, mdd, obj, mlc, handle);
struct thandle *handle)
{
struct mdd_device *mdd = mdd_obj2mdd_dev(obj);
+ struct lu_buf *som_buf = &mdd_env_info(env)->mti_buf[1];
+ struct lustre_som_attrs *som = &mlc->mlc_som;
+ int fl = 0;
int rc;
ENTRY;
* resync state. */
break;
case MD_LAYOUT_WRITE:
- /* legal race for concurrent write, the file state has been
- * changed by another client. */
+ /**
+ * legal race for concurrent write, the file state has been
+ * changed by another client. Or a jump over file size and
+ * write.
+ */
+ som_buf->lb_buf = som;
+ som_buf->lb_len = sizeof(*som);
+ rc = mdo_xattr_get(env, obj, som_buf, XATTR_NAME_SOM);
+ if (rc < 0 && rc != -ENODATA)
+ RETURN(rc);
+
+ if (rc > 0) {
+ lustre_som_swab(som);
+ if (mlc->mlc_intent->li_extent.e_end > som->lsa_size) {
+ som->lsa_size =
+ mlc->mlc_intent->li_extent.e_end + 1;
+ fl = LU_XATTR_REPLACE;
+ }
+ }
break;
default:
RETURN(-EBUSY);
if (rc)
GOTO(out, rc);
+ if (fl) {
+ rc = mdd_declare_xattr_set(env, mdd, obj, som_buf,
+ XATTR_NAME_SOM, fl, handle);
+ if (rc)
+ GOTO(out, rc);
+ }
+
rc = mdd_trans_start(env, mdd, handle);
if (rc)
GOTO(out, rc);
mdd_write_lock(env, obj, DT_TGT_CHILD);
rc = mdo_layout_change(env, obj, mlc, handle);
+ if (!rc && fl) {
+ som->lsa_valid = SOM_FL_STALE;
+ lustre_som_swab(som);
+ rc = mdo_xattr_set(env, obj, som_buf, XATTR_NAME_SOM,
+ fl, handle);
+ }
mdd_write_unlock(env, obj);
if (rc)
GOTO(out, rc);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff