summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
9d3ce29)
Seek over file size and write a FLR file does not change its SoM
and that makes file size incorrect.
Signed-off-by: Bobi Jam <bobijam@whamcloud.com>
Change-Id: I3075389721bdd40be60e9206c37f6c1bea514cce
Reviewed-on: https://review.whamcloud.com/43471
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: John L. Hammond <jhammond@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre_som_swab(som);
if (som->lsa_valid & SOM_FL_STRICT)
fl = LU_XATTR_REPLACE;
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);
}
rc = mdd_declare_layout_change(env, mdd, obj, mlc, handle);
struct thandle *handle)
{
struct mdd_device *mdd = mdd_obj2mdd_dev(obj);
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;
* resync state. */
break;
case MD_LAYOUT_WRITE:
* 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);
break;
default:
RETURN(-EBUSY);
+ 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);
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);
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);
mdd_write_unlock(env, obj);
if (rc)
GOTO(out, rc);