Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
LU-14854 mdd: proper handle error in mdd_swap_layouts()
[fs/lustre-release.git]
/
lustre
/
mdd
/
mdd_object.c
diff --git
a/lustre/mdd/mdd_object.c
b/lustre/mdd/mdd_object.c
index
3689a90
..
e431fdf
100644
(file)
--- a/
lustre/mdd/mdd_object.c
+++ b/
lustre/mdd/mdd_object.c
@@
-250,7
+250,7
@@
struct lu_buf *mdd_buf_get(const struct lu_env *env, void *area, ssize_t len)
{
struct lu_buf *buf;
- buf = &mdd_env_info(env)->m
t
i_buf[0];
+ buf = &mdd_env_info(env)->m
d
i_buf[0];
buf->lb_buf = area;
buf->lb_len = len;
return buf;
@@
-261,7
+261,7
@@
const struct lu_buf *mdd_buf_get_const(const struct lu_env *env,
{
struct lu_buf *buf;
- buf = &mdd_env_info(env)->m
t
i_buf[0];
+ buf = &mdd_env_info(env)->m
d
i_buf[0];
buf->lb_buf = (void *)area;
buf->lb_len = len;
return buf;
@@
-550,7
+550,7
@@
int mdd_declare_create_object_internal(const struct lu_env *env,
const struct md_op_spec *spec,
struct dt_allocation_hint *hint)
{
- struct dt_object_format *dof = &mdd_env_info(env)->m
t
i_dof;
+ struct dt_object_format *dof = &mdd_env_info(env)->m
d
i_dof;
const struct dt_index_features *feat = spec->sp_feat;
int rc;
ENTRY;
@@
-582,7
+582,7
@@
int mdd_create_object_internal(const struct lu_env *env, struct mdd_object *p,
const struct md_op_spec *spec,
struct dt_allocation_hint *hint)
{
- struct dt_object_format *dof = &mdd_env_info(env)->m
t
i_dof;
+ struct dt_object_format *dof = &mdd_env_info(env)->m
d
i_dof;
int rc;
ENTRY;
@@
-870,8
+870,10
@@
static int mdd_fix_attr(const struct lu_env *env, struct mdd_object *obj,
}
if (la->la_valid & LA_CTIME) {
- /* The pure setattr, it has the priority over what is
- * already set, do not drop it if ctime is equal. */
+ /**
+ * The pure setattr, it has the priority over what is
+ * already set, do not drop it if ctime is equal.
+ */
if (la->la_ctime < oattr->la_ctime)
la->la_valid &= ~(LA_ATIME | LA_MTIME | LA_CTIME);
}
@@
-911,7
+913,7
@@
static int mdd_changelog_data_store_by_fid(const struct lu_env *env,
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)->m
t
i_chlg_buf, reclen);
+ buf = lu_buf_check_and_alloc(&mdd_env_info(env)->m
d
i_chlg_buf, reclen);
if (buf->lb_buf == NULL)
RETURN(-ENOMEM);
rec = buf->lb_buf;
@@
-1088,7
+1090,7
@@
static int mdd_attr_set_changelog(const struct lu_env *env,
bits |= (valid & LA_MTIME) ? BIT(CL_MTIME) : 0;
bits |= (valid & LA_CTIME) ? BIT(CL_CTIME) : 0;
bits |= (valid & LA_ATIME) ? BIT(CL_ATIME) : 0;
- bits = bits & mdd->mdd_cl.mc_mask;
+ bits = bits & mdd->mdd_cl.mc_
current_
mask;
/* This is an implementation limit rather than a protocol limit */
BUILD_BUG_ON(CL_LAST > sizeof(int) * 8);
if (bits == 0)
@@
-1211,11
+1213,13
@@
int mdd_attr_set(const struct lu_env *env, struct md_object *obj,
struct mdd_object *mdd_obj = md2mdd_obj(obj);
struct mdd_device *mdd = mdo2mdd(obj);
struct thandle *handle = NULL;
- struct lu_attr *la_copy = &mdd_env_info(env)->m
t
i_la_for_fix;
+ struct lu_attr *la_copy = &mdd_env_info(env)->m
d
i_la_for_fix;
struct lu_attr *attr = MDD_ENV_VAR(env, cattr);
const struct lu_attr *la = &ma->ma_attr;
struct lu_ucred *uc;
+ bool quota_reserved = false;
bool chrgrp_by_unprivileged_user = false;
+ __s64 quota_size = 0;
int rc;
ENTRY;
@@
-1248,11
+1252,37
@@
int mdd_attr_set(const struct lu_env *env, struct md_object *obj,
uc = lu_ucred_check(env);
if (S_ISREG(attr->la_mode) && la->la_valid & LA_GID &&
la->la_gid != attr->la_gid && uc != NULL && uc->uc_fsuid != 0) {
- /* LU-10048: disable synchronous chgrp operation for it will
- * cause deadlock between MDT and OST.
- la_copy->la_valid |= LA_FLAGS;
- la_copy->la_flags |= LUSTRE_SET_SYNC_FL;
- */
+ CDEBUG(D_QUOTA, "%s: reserve quota for changing group: gid=%u size=%llu\n",
+ mdd2obd_dev(mdd)->obd_name, la->la_gid, la->la_size);
+
+ if (la->la_valid & LA_BLOCKS)
+ quota_size = la->la_blocks << 9;
+ else if (la->la_valid & LA_SIZE)
+ quota_size = la->la_size;
+ /* use local attr gotten above */
+ else if (attr->la_valid & LA_BLOCKS)
+ quota_size = attr->la_blocks << 9;
+ else if (attr->la_valid & LA_SIZE)
+ quota_size = attr->la_size;
+
+ if (quota_size > 0) {
+ rc = dt_reserve_or_free_quota(env, mdd->mdd_bottom,
+ GRPQUOTA, attr->la_uid,
+ la->la_gid, quota_size,
+ false);
+
+ if (rc) {
+ CDEBUG(D_QUOTA, "%s: failed to reserve quota for gid %d size %llu\n",
+ mdd2obd_dev(mdd)->obd_name,
+ la->la_gid, quota_size);
+
+ GOTO(out, rc);
+ }
+
+ quota_reserved = true;
+ la_copy->la_valid |= LA_FLAGS;
+ }
+
chrgrp_by_unprivileged_user = true;
/* Flush the possible existing client setattr requests to OSTs
@@
-1328,6
+1358,21
@@
out:
rc = mdd_attr_set_changelog(env, obj, handle, &ma->ma_pfid,
la_copy->la_valid);
+ if (rc == 0 && quota_reserved) {
+ struct thandle *sub_th;
+
+ sub_th = thandle_get_sub_by_dt(env, handle, mdd->mdd_bottom);
+ if (unlikely(IS_ERR(sub_th))) {
+ dt_reserve_or_free_quota(env, mdd->mdd_bottom, GRPQUOTA,
+ attr->la_uid, la->la_gid,
+ -quota_size, false);
+ } else {
+ sub_th->th_reserved_quota.qrr_type = GRPQUOTA;
+ sub_th->th_reserved_quota.qrr_id.qid_gid = la->la_gid;
+ sub_th->th_reserved_quota.qrr_count = quota_size;
+ }
+ }
+
if (handle != NULL)
rc = mdd_trans_stop(env, mdd, rc, handle);
@@
-1458,7
+1503,7
@@
static int mdd_hsm_update_locked(const struct lu_env *env,
RETURN(-ENOMEM);
/* Read HSM attrs from disk */
- current_buf = lu_buf_check_and_alloc(&info->m
t
i_xattr_buf,
+ current_buf = lu_buf_check_and_alloc(&info->m
d
i_xattr_buf,
min_t(unsigned int,
mdd_obj2mdd_dev(mdd_obj)->mdd_dt_conf.ddp_max_ea_size,
XATTR_SIZE_MAX));
@@
-1540,62
+1585,62
@@
static int mdd_xattr_merge(const struct lu_env *env, struct md_object *md_obj,
struct mdd_device *mdd = mdo2mdd(md_obj);
struct mdd_object *obj = md2mdd_obj(md_obj);
struct mdd_object *vic = md2mdd_obj(md_vic);
- struct lu_buf *buf = &mdd_env_info(env)->m
t
i_buf[0];
- struct lu_buf *buf_vic = &mdd_env_info(env)->m
t
i_buf[1];
+ struct lu_buf *buf = &mdd_env_info(env)->m
d
i_buf[0];
+ struct lu_buf *buf_vic = &mdd_env_info(env)->m
d
i_buf[1];
struct lov_mds_md *lmm;
struct thandle *handle;
- int rc;
+ int rc
, lock_order
;
ENTRY;
-
rc
= lu_fid_cmp(mdd_object_fid(obj), mdd_object_fid(vic));
- if (
rc
== 0) /* same fid */
+
lock_order
= lu_fid_cmp(mdd_object_fid(obj), mdd_object_fid(vic));
+ if (
lock_order
== 0) /* same fid */
RETURN(-EPERM);
handle = mdd_trans_create(env, mdd);
if (IS_ERR(handle))
RETURN(PTR_ERR(handle));
- 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);
- }
-
/* get EA of victim file */
memset(buf_vic, 0, sizeof(*buf_vic));
rc = mdd_stripe_get(env, vic, buf_vic, XATTR_NAME_LOV);
if (rc < 0) {
if (rc == -ENODATA)
rc = 0;
- GOTO(
out
, rc);
+ GOTO(
stop
, rc);
}
/* parse the layout of victim file */
lmm = buf_vic->lb_buf;
if (le32_to_cpu(lmm->lmm_magic) != LOV_MAGIC_COMP_V1)
- GOTO(
out
, rc = -EINVAL);
+ GOTO(
stop
, rc = -EINVAL);
/* save EA of target file for restore */
memset(buf, 0, sizeof(*buf));
rc = mdd_stripe_get(env, obj, buf, XATTR_NAME_LOV);
if (rc < 0)
- GOTO(
out
, rc);
+ GOTO(
stop
, rc);
/* Get rid of the layout from victim object */
rc = mdd_declare_xattr_del(env, mdd, vic, XATTR_NAME_LOV, handle);
if (rc)
- GOTO(
out
, rc);
+ GOTO(
stop
, rc);
rc = mdd_declare_xattr_set(env, mdd, obj, buf_vic, XATTR_NAME_LOV,
LU_XATTR_MERGE, handle);
if (rc)
- GOTO(
out
, rc);
+ GOTO(
stop
, rc);
rc = mdd_trans_start(env, mdd, handle);
if (rc != 0)
- GOTO(out, rc);
+ GOTO(stop, rc);
+
+ if (lock_order > 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);
+ }
rc = mdo_xattr_set(env, obj, buf_vic, XATTR_NAME_LOV, LU_XATTR_MERGE,
handle);
@@
-1623,9
+1668,10
@@
out_restore:
}
out:
- mdd_trans_stop(env, mdd, rc, handle);
mdd_write_unlock(env, obj);
mdd_write_unlock(env, vic);
+stop:
+ mdd_trans_stop(env, mdd, rc, handle);
lu_buf_free(buf);
lu_buf_free(buf_vic);
@@
-1770,9
+1816,9
@@
static int mdd_xattr_split(const struct lu_env *env, struct md_object *md_obj,
struct mdd_device *mdd = mdo2mdd(md_obj);
struct mdd_object *obj = md2mdd_obj(md_obj);
struct mdd_object *vic = NULL;
- struct lu_buf *buf = &mdd_env_info(env)->m
t
i_buf[0];
- struct lu_buf *buf_save = &mdd_env_info(env)->m
t
i_buf[1];
- struct lu_buf *buf_vic = &mdd_env_info(env)->m
t
i_buf[2];
+ struct lu_buf *buf = &mdd_env_info(env)->m
d
i_buf[0];
+ struct lu_buf *buf_save = &mdd_env_info(env)->m
d
i_buf[1];
+ struct lu_buf *buf_vic = &mdd_env_info(env)->m
d
i_buf[2];
struct lov_comp_md_v1 *lcm;
struct thandle *handle;
int rc;
@@
-2141,7
+2187,7
@@
stop:
int mdd_stripe_get(const struct lu_env *env, struct mdd_object *obj,
struct lu_buf *lmm_buf, const char *name)
{
- struct lu_buf *buf = &mdd_env_info(env)->m
t
i_big_buf;
+ struct lu_buf *buf = &mdd_env_info(env)->m
d
i_big_buf;
int rc;
ENTRY;
@@
-2155,9
+2201,9
@@
int mdd_stripe_get(const struct lu_env *env, struct mdd_object *obj,
repeat:
rc = mdo_xattr_get(env, obj, buf, name);
if (rc == -ERANGE) {
- /* m
t
i_big_buf is allocated but is too small
+ /* m
d
i_big_buf is allocated but is too small
* we need to increase it */
- buf = lu_buf_check_and_alloc(&mdd_env_info(env)->m
t
i_big_buf,
+ buf = lu_buf_check_and_alloc(&mdd_env_info(env)->m
d
i_big_buf,
buf->lb_len * 2);
if (buf->lb_buf == NULL)
RETURN(-ENOMEM);
@@
-2174,7
+2220,7
@@
repeat:
/*
* we don't use lmm_buf directly, because we don't know xattr size, so
- * by using m
t
i_big_buf we can avoid calling mdo_xattr_get() twice.
+ * by using m
d
i_big_buf we can avoid calling mdo_xattr_get() twice.
*/
memcpy(lmm_buf->lb_buf, buf->lb_buf, rc);
@@
-2386,10
+2432,10
@@
static int mdd_swap_layouts(const struct lu_env *env, struct md_object *obj1,
struct lu_attr *snd_la = MDD_ENV_VAR(env, tattr);
struct mdd_device *mdd = mdo2mdd(obj1);
struct lov_mds_md *fst_lmm, *snd_lmm;
- struct lu_buf *fst_buf = &info->m
t
i_buf[0];
- struct lu_buf *snd_buf = &info->m
t
i_buf[1];
- struct lu_buf *fst_hsm_buf = &info->m
t
i_buf[2];
- struct lu_buf *snd_hsm_buf = &info->m
t
i_buf[3];
+ struct lu_buf *fst_buf = &info->m
d
i_buf[0];
+ struct lu_buf *snd_buf = &info->m
d
i_buf[1];
+ struct lu_buf *fst_hsm_buf = &info->m
d
i_buf[2];
+ struct lu_buf *snd_hsm_buf = &info->m
d
i_buf[3];
struct ost_id *saved_oi = NULL;
struct thandle *handle;
struct mdd_object *dom_o = NULL;
@@
-2400,8
+2446,8
@@
static int mdd_swap_layouts(const struct lu_env *env, struct md_object *obj1,
ENTRY;
- BUILD_BUG_ON(ARRAY_SIZE(info->m
t
i_buf) < 4);
- memset(info->m
ti_buf, 0, sizeof(info->mt
i_buf));
+ BUILD_BUG_ON(ARRAY_SIZE(info->m
d
i_buf) < 4);
+ memset(info->m
di_buf, 0, sizeof(info->md
i_buf));
/* we have to sort the 2 obj, so locking will always
* be in the same order, even in case of 2 concurrent swaps */
@@
-2540,7
+2586,7
@@
static int mdd_swap_layouts(const struct lu_env *env, struct md_object *obj1,
if (fst_lmm != NULL) {
struct ost_id temp_oi;
- saved_oi = &info->m
t
i_oa.o_oi;
+ saved_oi = &info->m
d
i_oa.o_oi;
mdd_get_lmm_oi(fst_lmm, saved_oi);
mdd_get_lmm_oi(snd_lmm, &temp_oi);
mdd_set_lmm_gen(fst_lmm, &snd_gen);
@@
-2668,13
+2714,17
@@
out_restore:
if (rc2 < 0)
goto do_lbug;
- ++steps;
- rc2 = mdd_xattr_hsm_replace(env, fst_o, fst_hsm_buf, handle);
- if (rc2 < 0)
- goto do_lbug;
+ if (flags & SWAP_LAYOUTS_MDS_HSM) {
+ ++steps;
+ rc2 = mdd_xattr_hsm_replace(env, fst_o, fst_hsm_buf,
+ handle);
+ if (rc2 < 0)
+ goto do_lbug;
- ++steps;
- rc2 = mdd_xattr_hsm_replace(env, snd_o, snd_hsm_buf, handle);
+ ++steps;
+ rc2 = mdd_xattr_hsm_replace(env, snd_o, snd_hsm_buf,
+ handle);
+ }
do_lbug:
if (rc2 < 0) {
@@
-2781,7
+2831,7
@@
mdd_layout_update_rdonly(const struct lu_env *env, struct mdd_object *obj,
struct md_layout_change *mlc, struct thandle *handle)
{
struct mdd_device *mdd = mdd_obj2mdd_dev(obj);
- struct lu_buf *som_buf = &mdd_env_info(env)->m
t
i_buf[1];
+ struct lu_buf *som_buf = &mdd_env_info(env)->m
d
i_buf[1];
struct lustre_som_attrs *som = &mlc->mlc_som;
int fl = 0;
int rc;
@@
-2877,7
+2927,7
@@
mdd_layout_update_write_pending(const struct lu_env *env,
struct thandle *handle)
{
struct mdd_device *mdd = mdd_obj2mdd_dev(obj);
- struct lu_buf *som_buf = &mdd_env_info(env)->m
t
i_buf[1];
+ struct lu_buf *som_buf = &mdd_env_info(env)->m
d
i_buf[1];
struct lustre_som_attrs *som = &mlc->mlc_som;
int fl = 0;
int rc;
@@
-2969,7
+3019,7
@@
mdd_object_update_sync_pending(const struct lu_env *env, struct mdd_object *obj,
struct md_layout_change *mlc, struct thandle *handle)
{
struct mdd_device *mdd = mdd_obj2mdd_dev(obj);
- struct lu_buf *som_buf = &mdd_env_info(env)->m
t
i_buf[1];
+ struct lu_buf *som_buf = &mdd_env_info(env)->m
d
i_buf[1];
int fl = 0;
int rc;
ENTRY;
@@
-3260,7
+3310,7
@@
static int mdd_open(const struct lu_env *env, struct md_object *obj,
rc = mdd_open_sanity_check(env, mdd_obj, attr, open_flags,
spec->no_create);
- if ((rc == -EACCES) && (mdd->mdd_cl.mc_mask & BIT(CL_DN_OPEN)))
+ if ((rc == -EACCES) && (mdd->mdd_cl.mc_
current_
mask & BIT(CL_DN_OPEN)))
type = CL_DN_OPEN;
else if (rc != 0)
GOTO(out, rc);
@@
-3498,10
+3548,11
@@
out:
* this is not a big deal if we have a CL_CLOSE entry with no matching
* CL_OPEN. Plus Changelogs mask may not change often.
*/
- if (((!(mdd->mdd_cl.mc_mask & BIT(CL_OPEN)) &&
+ if (((!(mdd->mdd_cl.mc_
current_
mask & BIT(CL_OPEN)) &&
(open_flags & (MDS_FMODE_WRITE | MDS_OPEN_APPEND |
MDS_OPEN_TRUNC))) ||
- ((mdd->mdd_cl.mc_mask & BIT(CL_OPEN)) && last_close_by_uid)) &&
+ ((mdd->mdd_cl.mc_current_mask & BIT(CL_OPEN)) &&
+ last_close_by_uid)) &&
!(ma->ma_valid & MA_FLAGS && ma->ma_attr_flags & MDS_RECOV_OPEN)) {
if (handle == NULL) {
handle = mdd_trans_create(env, mdo2mdd(obj));