* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2012, 2016, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#include <linux/kthread.h>
#include "ofd_internal.h"
+#include <lustre_nodemap.h>
struct ofd_inconsistency_item {
struct list_head oii_list;
LASSERT(!fo->ofo_pfid_verified);
lrl->lrl_fid = fo->ofo_header.loh_fid; /* OST-object itself FID. */
- lrl->lrl_fid2 = client_ff->ff_parent; /* client given PFID. */
- lrl->lrl_fid3 = local_ff->ff_parent; /* OST local stored PFID. */
+ lrl->lrl_ff_client = *client_ff; /* client given PFID. */
+ lrl->lrl_ff_local = *local_ff; /* OST local stored PFID. */
rc = lfsck_in_notify_local(env, ofd->ofd_osd, lrl, NULL);
ofd_write_lock(env, fo);
struct ptlrpc_thread *thread = &ofd->ofd_inconsistency_thread;
struct ofd_inconsistency_item *oii;
struct lfsck_req_local *lrl = NULL;
- struct l_wait_info lwi = { 0 };
int rc;
ENTRY;
}
spin_unlock(&ofd->ofd_inconsistency_lock);
- l_wait_event(thread->t_ctl_waitq,
- !list_empty(&ofd->ofd_inconsistency_list) ||
- !thread_is_running(thread),
- &lwi);
+ wait_event_idle(thread->t_ctl_waitq,
+ !list_empty(&ofd->ofd_inconsistency_list) ||
+ !thread_is_running(thread));
spin_lock(&ofd->ofd_inconsistency_lock);
}
int ofd_start_inconsistency_verification_thread(struct ofd_device *ofd)
{
struct ptlrpc_thread *thread = &ofd->ofd_inconsistency_thread;
- struct l_wait_info lwi = { 0 };
struct task_struct *task;
int rc;
ofd_name(ofd), rc);
} else {
rc = 0;
- l_wait_event(thread->t_ctl_waitq,
- thread_is_running(thread) ||
- thread_is_stopped(thread),
- &lwi);
+ wait_event_idle(thread->t_ctl_waitq,
+ thread_is_running(thread) ||
+ thread_is_stopped(thread));
}
return rc;
int ofd_stop_inconsistency_verification_thread(struct ofd_device *ofd)
{
struct ptlrpc_thread *thread = &ofd->ofd_inconsistency_thread;
- struct l_wait_info lwi = { 0 };
spin_lock(&ofd->ofd_inconsistency_lock);
if (thread_is_init(thread) || thread_is_stopped(thread)) {
thread_set_flags(thread, SVC_STOPPING);
spin_unlock(&ofd->ofd_inconsistency_lock);
wake_up_all(&thread->t_ctl_waitq);
- l_wait_event(thread->t_ctl_waitq,
- thread_is_stopped(thread),
- &lwi);
+ wait_event_idle(thread->t_ctl_waitq,
+ thread_is_stopped(thread));
return 0;
}
ff->ff_parent.f_seq = oa->o_parent_seq;
ff->ff_parent.f_oid = oa->o_parent_oid;
ff->ff_parent.f_stripe_idx = oa->o_stripe_idx;
+ ff->ff_layout = oa->o_layout;
spin_lock(&ofd->ofd_inconsistency_lock);
if (fo->ofo_pfid_checking || fo->ofo_pfid_verified) {
}
/**
+ * FLR: verify the layout version of object.
+ *
+ * \param[in] env execution environment
+ * \param[in] fo OFD object
+ * \param[in] oa OBDO structure with layout version
+ *
+ * \retval 0 on successful verification
+ * \retval -EINPROGRESS layout version is in transfer
+ * \retval -ESTALE the layout version on client is stale
+ */
+int ofd_verify_layout_version(const struct lu_env *env,
+ struct ofd_object *fo, const struct obdo *oa)
+{
+ __u32 layout_version;
+ int rc;
+ ENTRY;
+
+ if (unlikely(OBD_FAIL_CHECK(OBD_FAIL_OST_SKIP_LV_CHECK)))
+ GOTO(out, rc = 0);
+
+ rc = ofd_object_ff_load(env, fo);
+ if (rc < 0) {
+ if (rc == -ENODATA)
+ rc = -EINPROGRESS;
+ GOTO(out, rc);
+ }
+
+ layout_version = fo->ofo_ff.ff_layout_version;
+ if (oa->o_layout_version >= layout_version &&
+ oa->o_layout_version <= layout_version + fo->ofo_ff.ff_range)
+ GOTO(out, rc = 0);
+
+ /* normal traffic, decide if to return ESTALE or EINPROGRESS */
+ layout_version &= ~LU_LAYOUT_RESYNC;
+
+ /* this update is not legitimate */
+ if ((oa->o_layout_version & ~LU_LAYOUT_RESYNC) <= layout_version)
+ GOTO(out, rc = -ESTALE);
+
+ /* layout version may not be transmitted yet */
+ if ((oa->o_layout_version & ~LU_LAYOUT_RESYNC) > layout_version)
+ GOTO(out, rc = -EINPROGRESS);
+
+ EXIT;
+
+out:
+ CDEBUG(D_INODE, DFID " verify layout version: %u vs. %u/%u, rc: %d\n",
+ PFID(lu_object_fid(&fo->ofo_obj.do_lu)),
+ oa->o_layout_version, fo->ofo_ff.ff_layout_version,
+ fo->ofo_ff.ff_range, rc);
+ return rc;
+
+}
+
+/*
+ * Lazy ATIME update to refresh atime every ofd_atime_diff
+ * seconds so that external scanning tool can see it actual
+ * within that period and be able to identify accessed files
+ */
+static void ofd_handle_atime(const struct lu_env *env, struct ofd_device *ofd,
+ struct ofd_object *fo, time64_t atime)
+{
+ struct lu_attr *la;
+ struct dt_object *o;
+ struct thandle *th;
+ int rc;
+
+ if (ofd->ofd_atime_diff == 0)
+ return;
+
+ la = &ofd_info(env)->fti_attr2;
+ o = ofd_object_child(fo);
+
+ if (unlikely(fo->ofo_atime_ondisk == 0)) {
+ rc = dt_attr_get(env, o, la);
+ if (unlikely(rc))
+ return;
+ LASSERT(la->la_valid & LA_ATIME);
+ if (la->la_atime == 0)
+ la->la_atime = la->la_mtime;
+ fo->ofo_atime_ondisk = la->la_atime;
+ }
+ if (atime - fo->ofo_atime_ondisk < ofd->ofd_atime_diff)
+ return;
+
+ /* atime hasn't been updated too long, update it */
+ fo->ofo_atime_ondisk = atime;
+
+ th = ofd_trans_create(env, ofd);
+ if (IS_ERR(th)) {
+ CERROR("%s: cannot create transaction: rc = %d\n",
+ ofd_name(ofd), (int)PTR_ERR(th));
+ return;
+ }
+
+ la->la_valid = LA_ATIME;
+ rc = dt_declare_attr_set(env, o, la, th);
+ if (rc)
+ GOTO(out_tx, rc);
+
+ rc = dt_trans_start_local(env, ofd->ofd_osd , th);
+ if (rc) {
+ CERROR("%s: cannot start transaction: rc = %d\n",
+ ofd_name(ofd), rc);
+ GOTO(out_tx, rc);
+ }
+
+ ofd_read_lock(env, fo);
+ if (ofd_object_exists(fo)) {
+ la->la_atime = fo->ofo_atime_ondisk;
+ rc = dt_attr_set(env, o, la, th);
+ }
+
+ ofd_read_unlock(env, fo);
+
+out_tx:
+ ofd_trans_stop(env, ofd, th, rc);
+}
+
+/**
* Prepare buffers for read request processing.
*
* This function converts remote buffers from client to local buffers
struct niobuf_remote *rnb, int *nr_local,
struct niobuf_local *lnb, char *jobid)
{
- struct ofd_object *fo;
- int i, j, rc, tot_bytes = 0;
+ struct ofd_object *fo;
+ int i, j, rc, tot_bytes = 0;
+ enum dt_bufs_type dbt = DT_BUFS_TYPE_READ;
+ int maxlnb = *nr_local;
+ __u64 begin, end;
+ ktime_t kstart = ktime_get();
ENTRY;
LASSERT(env != NULL);
RETURN(PTR_ERR(fo));
LASSERT(fo != NULL);
+ ofd_info(env)->fti_obj = fo;
+
+ if (oa->o_valid & OBD_MD_FLATIME)
+ ofd_handle_atime(env, ofd, fo, oa->o_atime);
+
ofd_read_lock(env, fo);
if (!ofd_object_exists(fo))
GOTO(unlock, rc = -ENOENT);
GOTO(unlock, rc);
}
- *nr_local = 0;
- for (i = 0, j = 0; i < niocount; i++) {
+ if (ptlrpc_connection_is_local(exp->exp_connection))
+ dbt |= DT_BUFS_TYPE_LOCAL;
+
+ begin = -1;
+ end = 0;
+
+ for (*nr_local = 0, i = 0, j = 0; i < niocount; i++) {
+ begin = min_t(__u64, begin, rnb[i].rnb_offset);
+ end = max_t(__u64, end, rnb[i].rnb_offset + rnb[i].rnb_len);
+
+ if (OBD_FAIL_CHECK(OBD_FAIL_OST_2BIG_NIOBUF))
+ rnb[i].rnb_len = 100 * 1024 * 1024;
+
rc = dt_bufs_get(env, ofd_object_child(fo), rnb + i,
- lnb + j, 0);
+ lnb + j, maxlnb, dbt);
if (unlikely(rc < 0))
GOTO(buf_put, rc);
LASSERT(rc <= PTLRPC_MAX_BRW_PAGES);
/* correct index for local buffers to continue with */
j += rc;
*nr_local += rc;
+ maxlnb -= rc;
LASSERT(j <= PTLRPC_MAX_BRW_PAGES);
tot_bytes += rnb[i].rnb_len;
}
LASSERT(*nr_local > 0 && *nr_local <= PTLRPC_MAX_BRW_PAGES);
- rc = dt_attr_get(env, ofd_object_child(fo), la);
- if (unlikely(rc))
- GOTO(buf_put, rc);
-
rc = dt_read_prep(env, ofd_object_child(fo), lnb, *nr_local);
if (unlikely(rc))
GOTO(buf_put, rc);
- ofd_counter_incr(exp, LPROC_OFD_STATS_READ, jobid, tot_bytes);
+ ofd_access(env, ofd,
+ &(struct lu_fid) {
+ .f_seq = oa->o_parent_seq,
+ .f_oid = oa->o_parent_oid,
+ .f_ver = oa->o_stripe_idx,
+ },
+ begin, end,
+ tot_bytes,
+ niocount,
+ READ);
+
+ ofd_counter_incr(exp, LPROC_OFD_STATS_READ_BYTES, jobid, tot_bytes);
+ ofd_counter_incr(exp, LPROC_OFD_STATS_READ, jobid,
+ ktime_us_delta(ktime_get(), kstart));
RETURN(0);
buf_put:
struct niobuf_remote *rnb, int *nr_local,
struct niobuf_local *lnb, char *jobid)
{
- struct ofd_object *fo;
- int i, j, k, rc = 0, tot_bytes = 0;
+ struct ofd_object *fo;
+ int i, j, k, rc = 0, tot_bytes = 0;
+ enum dt_bufs_type dbt = DT_BUFS_TYPE_WRITE;
+ int maxlnb = *nr_local;
+ __u64 begin, end;
+ ktime_t kstart = ktime_get();
ENTRY;
LASSERT(env != NULL);
ofd_seq_put(env, oseq);
}
+ /* Process incoming grant info, set OBD_BRW_GRANTED flag and grant some
+ * space back if possible, we have to do this outside of the lock as
+ * grant preparation may need to sync whole fs thus wait for all the
+ * transactions to complete. */
+ tgt_grant_prepare_write(env, exp, oa, rnb, obj->ioo_bufcnt);
+
fo = ofd_object_find(env, ofd, fid);
if (IS_ERR(fo))
GOTO(out, rc = PTR_ERR(fo));
LASSERT(fo != NULL);
+ ofd_info(env)->fti_obj = fo;
+
ofd_read_lock(env, fo);
if (!ofd_object_exists(fo)) {
CERROR("%s: BRW to missing obj "DOSTID"\n",
}
}
- /* Process incoming grant info, set OBD_BRW_GRANTED flag and grant some
- * space back if possible */
- ofd_grant_prepare_write(env, exp, oa, rnb, obj->ioo_bufcnt);
+ /* need to verify layout version */
+ if (oa->o_valid & OBD_MD_LAYOUT_VERSION) {
+ rc = ofd_verify_layout_version(env, fo, oa);
+ if (rc) {
+ ofd_read_unlock(env, fo);
+ ofd_object_put(env, fo);
+ GOTO(out, rc);
+ }
+
+ oa->o_valid &= ~OBD_MD_LAYOUT_VERSION;
+ }
+
+ if (ptlrpc_connection_is_local(exp->exp_connection))
+ dbt |= DT_BUFS_TYPE_LOCAL;
+
+ begin = -1;
+ end = 0;
/* parse remote buffers to local buffers and prepare the latter */
- *nr_local = 0;
- for (i = 0, j = 0; i < obj->ioo_bufcnt; i++) {
+ for (*nr_local = 0, i = 0, j = 0; i < obj->ioo_bufcnt; i++) {
+ begin = min_t(__u64, begin, rnb[i].rnb_offset);
+ end = max_t(__u64, end, rnb[i].rnb_offset + rnb[i].rnb_len);
+
+ if (OBD_FAIL_CHECK(OBD_FAIL_OST_2BIG_NIOBUF))
+ rnb[i].rnb_len += PAGE_SIZE;
rc = dt_bufs_get(env, ofd_object_child(fo),
- rnb + i, lnb + j, 1);
+ rnb + i, lnb + j, maxlnb, dbt);
if (unlikely(rc < 0))
GOTO(err, rc);
LASSERT(rc <= PTLRPC_MAX_BRW_PAGES);
/* correct index for local buffers to continue with */
for (k = 0; k < rc; k++) {
lnb[j+k].lnb_flags = rnb[i].rnb_flags;
+ lnb[j+k].lnb_flags &= ~OBD_BRW_LOCALS;
if (!(rnb[i].rnb_flags & OBD_BRW_GRANTED))
lnb[j+k].lnb_rc = -ENOSPC;
}
j += rc;
*nr_local += rc;
+ maxlnb -= rc;
LASSERT(j <= PTLRPC_MAX_BRW_PAGES);
tot_bytes += rnb[i].rnb_len;
}
if (unlikely(rc != 0))
GOTO(err, rc);
- ofd_counter_incr(exp, LPROC_OFD_STATS_WRITE, jobid, tot_bytes);
+ ofd_read_unlock(env, fo);
+
+ ofd_access(env, ofd,
+ &(struct lu_fid) {
+ .f_seq = oa->o_parent_seq,
+ .f_oid = oa->o_parent_oid,
+ .f_ver = oa->o_stripe_idx,
+ },
+ begin, end,
+ tot_bytes,
+ obj->ioo_bufcnt,
+ WRITE);
+
+ ofd_counter_incr(exp, LPROC_OFD_STATS_WRITE_BYTES, jobid, tot_bytes);
+ ofd_counter_incr(exp, LPROC_OFD_STATS_WRITE, jobid,
+ ktime_us_delta(ktime_get(), kstart));
RETURN(0);
err:
dt_bufs_put(env, ofd_object_child(fo), lnb, *nr_local);
ofd_read_unlock(env, fo);
ofd_object_put(env, fo);
- /* ofd_grant_prepare_write() was called, so we must commit */
- ofd_grant_commit(exp, oa->o_grant_used, rc);
+ /* tgt_grant_prepare_write() was called, so we must commit */
+ tgt_grant_commit(exp, oa->o_grant_used, rc);
out:
/* let's still process incoming grant information packed in the oa,
* but without enforcing grant since we won't proceed with the write.
* Just like a read request actually. */
- ofd_grant_prepare_read(env, exp, oa);
+ tgt_grant_prepare_read(env, exp, oa);
return rc;
}
int rc = 0;
if (*nr_local > PTLRPC_MAX_BRW_PAGES) {
- CERROR("%s: bulk has too many pages %d, which exceeds the"
- "maximum pages per RPC of %d\n",
+ CERROR("%s: bulk has too many pages %d, which exceeds the maximum pages per RPC of %d\n",
exp->exp_obd->obd_name, *nr_local, PTLRPC_MAX_BRW_PAGES);
RETURN(-EPROTO);
}
rc = ofd_preprw_write(env, exp, ofd, fid, &info->fti_attr, oa,
objcount, obj, rnb, nr_local, lnb, jobid);
} else if (cmd == OBD_BRW_READ) {
- ofd_grant_prepare_read(env, exp, oa);
+ tgt_grant_prepare_read(env, exp, oa);
rc = ofd_preprw_read(env, exp, ofd, fid, &info->fti_attr, oa,
obj->ioo_bufcnt, rnb, nr_local, lnb,
jobid);
- obdo_from_la(oa, &info->fti_attr, LA_ATIME);
} else {
CERROR("%s: wrong cmd %d received!\n",
exp->exp_obd->obd_name, cmd);
LASSERT(niocount > 0);
- fo = ofd_object_find(env, ofd, fid);
- if (IS_ERR(fo))
- RETURN(PTR_ERR(fo));
+ fo = ofd_info(env)->fti_obj;
LASSERT(fo != NULL);
LASSERT(ofd_object_exists(fo));
dt_bufs_put(env, ofd_object_child(fo), lnb, niocount);
ofd_read_unlock(env, fo);
ofd_object_put(env, fo);
- /* second put is pair to object_get in ofd_preprw_read */
- ofd_object_put(env, fo);
RETURN(0);
}
* \param[in] ofd OFD device
* \param[in] ofd_obj OFD object
* \param[in] la object attributes
- * \param[in] ff parent FID
+ * \param[in] oa obdo
*
* \retval 0 on successful attributes update
* \retval negative value on error
static int
ofd_write_attr_set(const struct lu_env *env, struct ofd_device *ofd,
struct ofd_object *ofd_obj, struct lu_attr *la,
- struct filter_fid *ff)
+ struct obdo *oa)
{
struct ofd_thread_info *info = ofd_info(env);
+ struct filter_fid *ff = &info->fti_mds_fid;
__u64 valid = la->la_valid;
- int rc;
struct thandle *th;
struct dt_object *dt_obj;
- int ff_needed = 0;
+ int fl = 0;
+ int rc;
ENTRY;
dt_obj = ofd_object_child(ofd_obj);
LASSERT(dt_obj != NULL);
- la->la_valid &= LA_UID | LA_GID;
+ la->la_valid &= LA_UID | LA_GID | LA_PROJID;
- rc = ofd_attr_handle_ugid(env, ofd_obj, la, 0 /* !is_setattr */);
+ rc = ofd_attr_handle_id(env, ofd_obj, la, 0 /* !is_setattr */);
if (rc != 0)
GOTO(out, rc);
- if (ff != NULL) {
- rc = ofd_object_ff_load(env, ofd_obj);
- if (rc == -ENODATA)
- ff_needed = 1;
- else if (rc < 0)
- GOTO(out, rc);
- }
-
- if (!la->la_valid && !ff_needed)
+ if (!la->la_valid && !(oa->o_valid &
+ (OBD_MD_FLFID | OBD_MD_FLOSTLAYOUT | OBD_MD_LAYOUT_VERSION)))
/* no attributes to set */
GOTO(out, rc = 0);
GOTO(out_tx, rc);
}
- if (ff_needed) {
- if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR1))
- ff->ff_parent.f_oid = cpu_to_le32(1UL << 31);
- if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_UNMATCHED_PAIR2))
- ff->ff_parent.f_oid =
- cpu_to_le32(le32_to_cpu(ff->ff_parent.f_oid) - 1);
-
- info->fti_buf.lb_buf = ff;
- info->fti_buf.lb_len = sizeof(*ff);
+ if (oa->o_valid & (OBD_MD_FLFID | OBD_MD_FLOSTLAYOUT |
+ OBD_MD_LAYOUT_VERSION)) {
rc = dt_declare_xattr_set(env, dt_obj, &info->fti_buf,
XATTR_NAME_FID, 0, th);
if (rc)
GOTO(out_tx, rc);
}
-
/* We don't need a transno for this operation which will be re-executed
* anyway when the OST_WRITE (with a transno assigned) is replayed */
rc = dt_trans_start_local(env, ofd->ofd_osd , th);
if (rc)
GOTO(out_tx, rc);
- /* set uid/gid */
+ ofd_read_lock(env, ofd_obj);
+
+ rc = ofd_attr_handle_id(env, ofd_obj, la, 0 /* !is_setattr */);
+ if (rc != 0)
+ GOTO(out_unlock, rc);
+
+ if (!la->la_valid && !(oa->o_valid &
+ (OBD_MD_FLFID | OBD_MD_FLOSTLAYOUT | OBD_MD_LAYOUT_VERSION)))
+ /* no attributes to set */
+ GOTO(out_unlock, rc = 0);
+
+
+
+ /* set uid/gid/projid */
if (la->la_valid) {
rc = dt_attr_set(env, dt_obj, la, th);
if (rc)
- GOTO(out_tx, rc);
- }
-
- /* set filter fid EA */
- if (ff_needed) {
- if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_NOPFID))
- GOTO(out_tx, rc);
-
- rc = dt_xattr_set(env, dt_obj, &info->fti_buf, XATTR_NAME_FID,
- 0, th);
- if (!rc)
- filter_fid_le_to_cpu(&ofd_obj->ofo_ff, ff, sizeof(*ff));
+ GOTO(out_unlock, rc);
}
- GOTO(out_tx, rc);
-
+ fl = ofd_object_ff_update(env, ofd_obj, oa, ff);
+ if (fl <= 0)
+ GOTO(out_unlock, rc = fl);
+
+ /* set filter fid EA.
+ * FIXME: it holds read lock of ofd object to modify the XATTR_NAME_FID
+ * while the write lock should be held. However, it should work because
+ * write RPCs only modify ff_{parent,layout} and those information will
+ * be the same from all the write RPCs. The reason that fl is not used
+ * in dt_xattr_set() is to allow this race. */
+ if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_NOPFID))
+ GOTO(out_unlock, 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);
+
+ info->fti_buf.lb_buf = ff;
+ info->fti_buf.lb_len = sizeof(*ff);
+ rc = dt_xattr_set(env, dt_obj, &info->fti_buf, XATTR_NAME_FID, 0, th);
+ if (rc == 0)
+ filter_fid_le_to_cpu(&ofd_obj->ofo_ff, ff, sizeof(*ff));
+
+ GOTO(out_unlock, rc);
+
+out_unlock:
+ ofd_read_unlock(env, ofd_obj);
out_tx:
dt_trans_stop(env, ofd->ofd_osd, th);
out:
static int
ofd_commitrw_write(const struct lu_env *env, struct obd_export *exp,
struct ofd_device *ofd, const struct lu_fid *fid,
- struct lu_attr *la, struct filter_fid *ff, int objcount,
+ struct lu_attr *la, struct obdo *oa, int objcount,
int niocount, struct niobuf_local *lnb,
unsigned long granted, int old_rc)
{
+ struct ofd_thread_info *info = ofd_info(env);
struct filter_export_data *fed = &exp->exp_filter_data;
struct ofd_object *fo;
struct dt_object *o;
LASSERT(objcount == 1);
- fo = ofd_object_find(env, ofd, fid);
+ fo = ofd_info(env)->fti_obj;
LASSERT(fo != NULL);
- LASSERT(ofd_object_exists(fo));
o = ofd_object_child(fo);
LASSERT(o != NULL);
if (old_rc)
GOTO(out, rc = old_rc);
+ if (!ofd_object_exists(fo))
+ GOTO(out, rc = -ENOENT);
/*
* The first write to each object must set some attributes. It is
* dt_declare_write_commit() since quota enforcement is now handled in
* declare phases.
*/
- rc = ofd_write_attr_set(env, ofd, fo, la, ff);
+ rc = ofd_write_attr_set(env, ofd, fo, la, oa);
if (rc)
GOTO(out, rc);
if (IS_ERR(th))
GOTO(out, rc = PTR_ERR(th));
- th->th_sync |= ofd->ofd_syncjournal;
+ th->th_sync |= ofd->ofd_sync_journal;
if (th->th_sync == 0) {
for (i = 0; i < niocount; i++) {
if (!(lnb[i].lnb_flags & OBD_BRW_ASYNC)) {
GOTO(out_stop, rc);
}
+ /* don't update atime on disk if it is older */
+ if (la->la_valid & LA_ATIME && la->la_atime <= fo->ofo_atime_ondisk)
+ la->la_valid &= ~LA_ATIME;
+
if (la->la_valid) {
/* update [mac]time if needed */
rc = dt_declare_attr_set(env, o, la, th);
if (rc)
GOTO(out_stop, rc);
+ ofd_read_lock(env, fo);
+ if (!ofd_object_exists(fo))
+ GOTO(out_unlock, rc = -ENOENT);
+
if (likely(!fake_write)) {
- rc = dt_write_commit(env, o, lnb, niocount, th);
+ OBD_FAIL_TIMEOUT_ORSET(OBD_FAIL_OST_WR_ATTR_DELAY,
+ OBD_FAIL_ONCE, cfs_fail_val);
+ rc = dt_write_commit(env, o, lnb, niocount, th, oa->o_size);
if (rc)
- GOTO(out_stop, rc);
+ GOTO(out_unlock, rc);
}
- if (la->la_valid) {
+ /* Don't update timestamps if this write is older than a
+ * setattr which modifies the timestamps. b=10150 */
+ if (la->la_valid && tgt_fmd_check(exp, fid, info->fti_xid)) {
rc = dt_attr_set(env, o, la, th);
if (rc)
- GOTO(out_stop, rc);
+ GOTO(out_unlock, rc);
+ if (la->la_valid & LA_ATIME)
+ fo->ofo_atime_ondisk = la->la_atime;
}
/* get attr to return */
rc = dt_attr_get(env, o, la);
+out_unlock:
+ ofd_read_unlock(env, fo);
out_stop:
/* Force commit to make the just-deleted blocks
* reusable. LU-456 */
}
if (rc == 0 && granted > 0) {
- if (ofd_grant_commit_cb_add(th, exp, granted) == 0)
+ if (tgt_grant_commit_cb_add(th, exp, granted) == 0)
granted = 0;
}
out:
dt_bufs_put(env, o, lnb, niocount);
- ofd_read_unlock(env, fo);
- ofd_object_put(env, fo);
- /* second put is pair to object_get in ofd_preprw_write */
ofd_object_put(env, fo);
if (granted > 0)
- ofd_grant_commit(exp, granted, old_rc);
+ tgt_grant_commit(exp, granted, old_rc);
RETURN(rc);
}
struct niobuf_remote *rnb, int npages,
struct niobuf_local *lnb, int old_rc)
{
- struct ofd_thread_info *info = ofd_info(env);
- struct ofd_mod_data *fmd;
- __u64 valid;
- struct ofd_device *ofd = ofd_exp(exp);
- struct filter_fid *ff = NULL;
- const struct lu_fid *fid = &oa->o_oi.oi_fid;
- int rc = 0;
+ struct ofd_thread_info *info = ofd_info(env);
+ struct ofd_device *ofd = ofd_exp(exp);
+ const struct lu_fid *fid = &oa->o_oi.oi_fid;
+ struct ldlm_namespace *ns = ofd->ofd_namespace;
+ struct ldlm_resource *rs = NULL;
+ __u64 valid;
+ int rc = 0;
LASSERT(npages > 0);
if (cmd == OBD_BRW_WRITE) {
- /* Don't update timestamps if this write is older than a
- * setattr which modifies the timestamps. b=10150 */
-
- /* XXX when we start having persistent reservations this needs
- * to be changed to ofd_fmd_get() to create the fmd if it
- * doesn't already exist so we can store the reservation handle
- * there. */
- valid = OBD_MD_FLUID | OBD_MD_FLGID;
- fmd = ofd_fmd_find(exp, fid);
- if (!fmd || fmd->fmd_mactime_xid < info->fti_xid)
- valid |= OBD_MD_FLATIME | OBD_MD_FLMTIME |
- OBD_MD_FLCTIME;
- ofd_fmd_put(exp, fmd);
- la_from_obdo(&info->fti_attr, oa, valid);
+ struct lu_nodemap *nodemap;
- if (oa->o_valid & OBD_MD_FLFID) {
- ff = &info->fti_mds_fid;
- ofd_prepare_fidea(ff, oa);
- }
+ valid = OBD_MD_FLUID | OBD_MD_FLGID | OBD_MD_FLPROJID |
+ OBD_MD_FLATIME | OBD_MD_FLMTIME | OBD_MD_FLCTIME;
+ la_from_obdo(&info->fti_attr, oa, valid);
rc = ofd_commitrw_write(env, exp, ofd, fid, &info->fti_attr,
- ff, objcount, npages, lnb,
+ oa, objcount, npages, lnb,
oa->o_grant_used, old_rc);
if (rc == 0)
obdo_from_la(oa, &info->fti_attr,
- OFD_VALID_FLAGS | LA_GID | LA_UID);
+ OFD_VALID_FLAGS | LA_GID | LA_UID |
+ LA_PROJID);
else
- obdo_from_la(oa, &info->fti_attr, LA_GID | LA_UID);
+ obdo_from_la(oa, &info->fti_attr, LA_GID | LA_UID |
+ LA_PROJID);
/* don't report overquota flag if we failed before reaching
* commit */
else
oa->o_flags = OBD_FL_NO_GRPQUOTA;
}
+ if (lnb[0].lnb_flags & OBD_BRW_OVER_PRJQUOTA) {
+ if (oa->o_valid & OBD_MD_FLFLAGS)
+ oa->o_flags |= OBD_FL_NO_PRJQUOTA;
+ else
+ oa->o_flags = OBD_FL_NO_PRJQUOTA;
+ }
oa->o_valid |= OBD_MD_FLFLAGS;
- oa->o_valid |= OBD_MD_FLUSRQUOTA | OBD_MD_FLGRPQUOTA;
+ oa->o_valid |= OBD_MD_FLALLQUOTA;
}
- } else if (cmd == OBD_BRW_READ) {
- struct ldlm_namespace *ns = ofd->ofd_namespace;
-
- /* If oa != NULL then ofd_preprw_read updated the inode
- * atime and we should update the lvb so that other glimpses
- * will also get the updated value. bug 5972 */
- if (oa && ns && ns->ns_lvbo && ns->ns_lvbo->lvbo_update) {
- struct ldlm_resource *rs = NULL;
+ /**
+ * Update LVB after writing finish for server lock, see
+ * comments in ldlm_lock_decref_internal(), If this is a
+ * local lock on a server namespace and this was the last
+ * reference, lock will be destroyed directly thus there
+ * is no chance for ldlm_request_cancel() to update lvb.
+ */
+ if (rc == 0 && (rnb[0].rnb_flags & OBD_BRW_SRVLOCK)) {
ost_fid_build_resid(fid, &info->fti_resid);
rs = ldlm_resource_get(ns, NULL, &info->fti_resid,
LDLM_EXTENT, 0);
ldlm_resource_putref(rs);
}
}
+
+ /* Convert back to client IDs. LU-9671.
+ * nodemap_get_from_exp() may fail due to nodemap deactivated,
+ * server ID will be returned back to client in that case. */
+ nodemap = nodemap_get_from_exp(exp);
+ if (nodemap != NULL && !IS_ERR(nodemap)) {
+ oa->o_uid = nodemap_map_id(nodemap, NODEMAP_UID,
+ NODEMAP_FS_TO_CLIENT,
+ oa->o_uid);
+ oa->o_gid = nodemap_map_id(nodemap, NODEMAP_GID,
+ NODEMAP_FS_TO_CLIENT,
+ oa->o_gid);
+ nodemap_putref(nodemap);
+ }
+ } else if (cmd == OBD_BRW_READ) {
rc = ofd_commitrw_read(env, ofd, fid, objcount,
npages, lnb);
if (old_rc)