-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
* GPL HEADER START
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
/*
* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
* Author: Yury Umanets <umka@clusterfs.com>
*/
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
#define DEBUG_SUBSYSTEM S_MDS
#include "mdt_internal.h"
static inline void mdt_reint_init_ma(struct mdt_thread_info *info,
struct md_attr *ma)
{
- ma->ma_lmm = req_capsule_server_get(info->mti_pill, &RMF_MDT_MD);
- ma->ma_lmm_size = req_capsule_get_size(info->mti_pill,
- &RMF_MDT_MD, RCL_SERVER);
-
- ma->ma_cookie = req_capsule_server_get(info->mti_pill,
- &RMF_LOGCOOKIES);
- ma->ma_cookie_size = req_capsule_get_size(info->mti_pill,
- &RMF_LOGCOOKIES,
- RCL_SERVER);
-
- ma->ma_need = MA_INODE | MA_LOV | MA_COOKIE;
+ ma->ma_need = MA_INODE;
ma->ma_valid = 0;
}
{
LASSERT(o);
LASSERT(mdt_object_exists(o) >= 0);
- if (mdt_object_exists(o) > 0)
- *version = mo_version_get(info->mti_env, mdt_object_child(o));
+ if (mdt_object_exists(o) > 0 && !mdt_object_obf(o))
+ *version = dt_version_get(info->mti_env, mdt_obj2dt(o));
else
*version = ENOENT_VERSION;
CDEBUG(D_INODE, "FID "DFID" version is "LPX64"\n",
/** Sanity check for malformed buffers */
if (pre_ver == NULL) {
CERROR("No versions in request buffer\n");
- cfs_spin_lock(&req->rq_export->exp_lock);
- req->rq_export->exp_vbr_failed = 1;
- cfs_spin_unlock(&req->rq_export->exp_lock);
- RETURN(-EOVERFLOW);
- } else if (pre_ver[idx] != version) {
- CDEBUG(D_INODE, "Version mismatch "LPX64" != "LPX64"\n",
- pre_ver[idx], version);
- cfs_spin_lock(&req->rq_export->exp_lock);
- req->rq_export->exp_vbr_failed = 1;
- cfs_spin_unlock(&req->rq_export->exp_lock);
- RETURN(-EOVERFLOW);
- }
- RETURN(0);
+ spin_lock(&req->rq_export->exp_lock);
+ req->rq_export->exp_vbr_failed = 1;
+ spin_unlock(&req->rq_export->exp_lock);
+ RETURN(-EOVERFLOW);
+ } else if (pre_ver[idx] != version) {
+ CDEBUG(D_INODE, "Version mismatch "LPX64" != "LPX64"\n",
+ pre_ver[idx], version);
+ spin_lock(&req->rq_export->exp_lock);
+ req->rq_export->exp_vbr_failed = 1;
+ spin_unlock(&req->rq_export->exp_lock);
+ RETURN(-EOVERFLOW);
+ }
+ RETURN(0);
}
/**
if (IS_ERR(parent))
RETURN(PTR_ERR(parent));
+ if (mdt_object_obf(parent))
+ GOTO(out_put_parent, rc = -EPERM);
+
rc = mdt_version_get_check_save(info, parent, 0);
if (rc)
GOTO(out_put_parent, rc);
lname = mdt_name(info->mti_env, (char *)rr->rr_name, rr->rr_namelen);
rc = mdt_lookup_version_check(info, parent, lname,
&info->mti_tmp_fid1, 1);
- /* -ENOENT is expected here */
- if (rc != 0 && rc != -ENOENT)
- GOTO(out_put_parent, rc);
+ if (rc == 0)
+ GOTO(out_put_parent, rc = -EEXIST);
- /* save version of file name for replay, it must be ENOENT here */
- mdt_enoent_version_save(info, 1);
+ /* -ENOENT is expected here */
+ if (rc != -ENOENT)
+ GOTO(out_put_parent, rc);
+
+ /* save version of file name for replay, it must be ENOENT here */
+ mdt_enoent_version_save(info, 1);
- child = mdt_object_find(info->mti_env, mdt, rr->rr_fid2);
+ child = mdt_object_new(info->mti_env, mdt, rr->rr_fid2);
if (likely(!IS_ERR(child))) {
struct md_object *next = mdt_object_child(parent);
info->mti_spec.sp_cr_mode =
mdt_dlm_mode2mdl_mode(lh->mlh_pdo_mode);
- /*
- * Do perform lookup sanity check. We do not know if name exists
- * or not.
- */
- info->mti_spec.sp_cr_lookup = 1;
+ /*
+ * Do not perform lookup sanity check. We know that name does
+ * not exist.
+ */
+ info->mti_spec.sp_cr_lookup = 0;
info->mti_spec.sp_feat = &dt_directory_features;
rc = mdo_create(info->mti_env, next, lname,
mdt_object_child(child),
&info->mti_spec, ma);
+ if (rc == 0)
+ rc = mdt_attr_get_complex(info, child, ma);
+
if (rc == 0) {
/* Return fid & attr to client. */
if (ma->ma_valid & MA_INODE)
RETURN(rc);
}
-/* Partial request to create object only */
-static int mdt_md_mkobj(struct mdt_thread_info *info)
-{
- struct mdt_device *mdt = info->mti_mdt;
- struct mdt_object *o;
- struct mdt_body *repbody;
- struct md_attr *ma = &info->mti_attr;
- int rc;
- ENTRY;
-
- DEBUG_REQ(D_INODE, mdt_info_req(info), "Partial create "DFID"",
- PFID(info->mti_rr.rr_fid2));
-
- repbody = req_capsule_server_get(info->mti_pill, &RMF_MDT_BODY);
-
- o = mdt_object_find(info->mti_env, mdt, info->mti_rr.rr_fid2);
- if (!IS_ERR(o)) {
- struct md_object *next = mdt_object_child(o);
-
- ma->ma_need = MA_INODE;
- ma->ma_valid = 0;
-
- /*
- * Cross-ref create can encounter already created obj in case of
- * recovery, just get attr in that case.
- */
- if (mdt_object_exists(o) == 1) {
- rc = mo_attr_get(info->mti_env, next, ma);
- } else {
- /*
- * Here, NO permission check for object_create,
- * such check has been done on the original MDS.
- */
- rc = mo_object_create(info->mti_env, next,
- &info->mti_spec, ma);
- }
- if (rc == 0) {
- /* Return fid & attr to client. */
- if (ma->ma_valid & MA_INODE)
- mdt_pack_attr2body(info, repbody, &ma->ma_attr,
- mdt_object_fid(o));
- }
- mdt_object_put(info->mti_env, o);
- } else
- rc = PTR_ERR(o);
-
- mdt_create_pack_capa(info, rc, o, repbody);
- RETURN(rc);
-}
-
-/* In the raw-setattr case, we lock the child inode.
- * In the write-back case or if being called from open,
- * the client holds a lock already.
- * We use the ATTR_FROM_OPEN (translated into MRF_SETATTR_LOCKED by
- * mdt_setattr_unpack()) flag to tell these cases apart. */
int mdt_attr_set(struct mdt_thread_info *info, struct mdt_object *mo,
struct md_attr *ma, int flags)
{
struct mdt_lock_handle *lh;
int do_vbr = ma->ma_attr.la_valid & (LA_MODE|LA_UID|LA_GID|LA_FLAGS);
+ __u64 lockpart = MDS_INODELOCK_UPDATE;
int rc;
ENTRY;
lh = &info->mti_lh[MDT_LH_PARENT];
mdt_lock_reg_init(lh, LCK_PW);
- if (!(flags & MRF_SETATTR_LOCKED)) {
- __u64 lockpart = MDS_INODELOCK_UPDATE;
- if (ma->ma_attr.la_valid & (LA_MODE|LA_UID|LA_GID))
- lockpart |= MDS_INODELOCK_LOOKUP;
+ if (ma->ma_attr.la_valid & (LA_MODE|LA_UID|LA_GID))
+ lockpart |= MDS_INODELOCK_LOOKUP;
- rc = mdt_object_lock(info, mo, lh, lockpart, MDT_LOCAL_LOCK);
- if (rc != 0)
- RETURN(rc);
- }
+ rc = mdt_object_lock(info, mo, lh, lockpart, MDT_LOCAL_LOCK);
+ if (rc != 0)
+ RETURN(rc);
if (mdt_object_exists(mo) == 0)
GOTO(out_unlock, rc = -ENOENT);
struct mdt_export_data *med = &req->rq_export->exp_mdt_data;
struct mdt_file_data *mfd;
struct mdt_object *mo;
- struct md_object *next;
struct mdt_body *repbody;
- int som_au, rc;
+ int som_au, rc, rc2;
ENTRY;
DEBUG_REQ(D_INODE, req, "setattr "DFID" %x", PFID(rr->rr_fid1),
if (IS_ERR(mo))
GOTO(out, rc = PTR_ERR(mo));
+ if (mdt_object_obf(mo))
+ GOTO(out_put, rc = -EPERM);
+
/* start a log jounal handle if needed */
if (!(mdt_conn_flags(info) & OBD_CONNECT_SOM)) {
if ((ma->ma_attr.la_valid & LA_SIZE) ||
- (rr->rr_flags & MRF_SETATTR_LOCKED)) {
+ (rr->rr_flags & MRF_OPEN_TRUNC)) {
/* Check write access for the O_TRUNC case */
if (mdt_write_read(mo) < 0)
GOTO(out_put, rc = -ETXTBSY);
repbody->ioepoch = mo->mot_ioepoch;
mdt_object_get(info->mti_env, mo);
- mdt_mfd_set_mode(mfd, FMODE_TRUNC);
+ mdt_mfd_set_mode(mfd, MDS_FMODE_TRUNC);
mfd->mfd_object = mo;
mfd->mfd_xid = req->rq_xid;
- cfs_spin_lock(&med->med_open_lock);
- cfs_list_add(&mfd->mfd_list, &med->med_open_head);
- cfs_spin_unlock(&med->med_open_lock);
+ spin_lock(&med->med_open_lock);
+ cfs_list_add(&mfd->mfd_list, &med->med_open_head);
+ spin_unlock(&med->med_open_lock);
repbody->handle.cookie = mfd->mfd_handle.h_cookie;
}
LASSERT(mdt_conn_flags(info) & OBD_CONNECT_SOM);
LASSERT(info->mti_ioepoch);
- cfs_spin_lock(&med->med_open_lock);
- mfd = mdt_handle2mfd(info, &info->mti_ioepoch->handle);
- if (mfd == NULL) {
- cfs_spin_unlock(&med->med_open_lock);
+ spin_lock(&med->med_open_lock);
+ mfd = mdt_handle2mfd(info, &info->mti_ioepoch->handle);
+ if (mfd == NULL) {
+ spin_unlock(&med->med_open_lock);
CDEBUG(D_INODE, "no handle for file close: "
"fid = "DFID": cookie = "LPX64"\n",
PFID(info->mti_rr.rr_fid1),
info->mti_ioepoch->handle.cookie);
GOTO(out_put, rc = -ESTALE);
}
- LASSERT(mfd->mfd_mode == FMODE_SOM);
+ LASSERT(mfd->mfd_mode == MDS_FMODE_SOM);
LASSERT(!(info->mti_ioepoch->flags & MF_EPOCH_CLOSE));
class_handle_unhash(&mfd->mfd_handle);
cfs_list_del_init(&mfd->mfd_list);
- cfs_spin_unlock(&med->med_open_lock);
-
- /* Close the found mfd, update attributes. */
- ma->ma_lmm_size = info->mti_mdt->mdt_max_mdsize;
- OBD_ALLOC_LARGE(ma->ma_lmm, info->mti_mdt->mdt_max_mdsize);
- if (ma->ma_lmm == NULL)
- GOTO(out_put, rc = -ENOMEM);
+ spin_unlock(&med->med_open_lock);
mdt_mfd_close(info, mfd);
-
- OBD_FREE_LARGE(ma->ma_lmm, info->mti_mdt->mdt_max_mdsize);
- } else {
+ } else if ((ma->ma_valid & MA_INODE) && ma->ma_attr.la_valid) {
+ LASSERT((ma->ma_valid & MA_LOV) == 0);
rc = mdt_attr_set(info, mo, ma, rr->rr_flags);
if (rc)
GOTO(out_put, rc);
- }
+ } else if ((ma->ma_valid & MA_LOV) && (ma->ma_valid & MA_INODE)) {
+ struct lu_buf *buf = &info->mti_buf;
+ LASSERT(ma->ma_attr.la_valid == 0);
+ buf->lb_buf = ma->ma_lmm;
+ buf->lb_len = ma->ma_lmm_size;
+ rc = mo_xattr_set(info->mti_env, mdt_object_child(mo),
+ buf, XATTR_NAME_LOV, 0);
+ if (rc)
+ GOTO(out_put, rc);
+ } else
+ LBUG();
ma->ma_need = MA_INODE;
ma->ma_valid = 0;
- next = mdt_object_child(mo);
- rc = mo_attr_get(info->mti_env, next, ma);
+ rc = mdt_attr_get_complex(info, mo, ma);
if (rc != 0)
GOTO(out_put, rc);
out_put:
mdt_object_put(info->mti_env, mo);
out:
- mdt_shrink_reply(info);
+ if (rc == 0)
+ mdt_counter_incr(req, LPROC_MDT_SETATTR);
+
+ mdt_client_compatibility(info);
+ rc2 = mdt_fix_reply(info);
+ if (rc == 0)
+ rc = rc2;
return rc;
}
if (info->mti_dlm_req)
ldlm_request_cancel(mdt_info_req(info), info->mti_dlm_req, 0);
+ LASSERT(info->mti_rr.rr_namelen > 0);
switch (info->mti_attr.ma_attr.la_mode & S_IFMT) {
- case S_IFDIR:{
- /* Cross-ref case. */
- /* TODO: we can add LPROC_MDT_CROSS for cross-ref stats */
- if (info->mti_cross_ref) {
- rc = mdt_md_mkobj(info);
- } else {
- LASSERT(info->mti_rr.rr_namelen > 0);
- mdt_counter_incr(req->rq_export, LPROC_MDT_MKDIR);
- rc = mdt_md_create(info);
- }
- break;
- }
+ case S_IFDIR:
+ mdt_counter_incr(req, LPROC_MDT_MKDIR);
+ break;
case S_IFREG:
case S_IFLNK:
case S_IFCHR:
case S_IFBLK:
case S_IFIFO:
- case S_IFSOCK:{
- /* Special file should stay on the same node as parent. */
- LASSERT(info->mti_rr.rr_namelen > 0);
- mdt_counter_incr(req->rq_export, LPROC_MDT_MKNOD);
- rc = mdt_md_create(info);
- break;
- }
- default:
- rc = err_serious(-EOPNOTSUPP);
- }
- RETURN(rc);
+ case S_IFSOCK:
+ /* Special file should stay on the same node as parent. */
+ mdt_counter_incr(req, LPROC_MDT_MKNOD);
+ break;
+ default:
+ CERROR("%s: Unsupported mode %o\n",
+ mdt2obd_dev(info->mti_mdt)->obd_name,
+ info->mti_attr.ma_attr.la_mode);
+ RETURN(err_serious(-EOPNOTSUPP));
+ }
+
+ rc = mdt_md_create(info);
+ RETURN(rc);
}
/*
RETURN(err_serious(-ENOENT));
/*
- * step 1: lock the parent. Note, this may be child in case of
- * remote operation denoted by ->mti_cross_ref flag.
+ * step 1: lock the parent.
*/
parent_lh = &info->mti_lh[MDT_LH_PARENT];
- if (info->mti_cross_ref) {
- /*
- * Init reg lock for cross ref case when we need to do only
- * ref del locally.
- */
- mdt_lock_reg_init(parent_lh, LCK_PW);
- } else {
- mdt_lock_pdo_init(parent_lh, LCK_PW, rr->rr_name,
- rr->rr_namelen);
- }
+ mdt_lock_pdo_init(parent_lh, LCK_PW, rr->rr_name,
+ rr->rr_namelen);
+
mp = mdt_object_find_lock(info, rr->rr_fid1, parent_lh,
MDS_INODELOCK_UPDATE);
- if (IS_ERR(mp)) {
- rc = PTR_ERR(mp);
- /* errors are possible here in cross-ref cases, see below */
- if (info->mti_cross_ref)
- rc = 0;
- GOTO(out, rc);
- }
+ if (IS_ERR(mp))
+ GOTO(out, rc = PTR_ERR(mp));
+
+ if (mdt_object_obf(mp))
+ GOTO(out_unlock_parent, rc = -EPERM);
rc = mdt_version_get_check_save(info, mp, 0);
if (rc)
GOTO(out_unlock_parent, rc);
mdt_reint_init_ma(info, ma);
- if (!ma->ma_lmm || !ma->ma_cookie)
- GOTO(out_unlock_parent, rc = -EINVAL);
-
- if (info->mti_cross_ref) {
- /*
- * Remote partial operation. It is possible that replay may
- * happen on parent MDT and this operation will be repeated.
- * Therefore the object absense is allowed case and nothing
- * should be done here.
- */
- if (mdt_object_exists(mp) > 0) {
- mdt_set_capainfo(info, 0, rr->rr_fid1, BYPASS_CAPA);
- rc = mo_ref_del(info->mti_env,
- mdt_object_child(mp), ma);
- if (rc == 0)
- mdt_handle_last_unlink(info, mp, ma);
- } else
- rc = 0;
- GOTO(out_unlock_parent, rc);
- }
/* step 2: find & lock the child */
lname = mdt_name(info->mti_env, (char *)rr->rr_name, rr->rr_namelen);
/* lookup child object along with version checking */
+ fid_zero(child_fid);
rc = mdt_lookup_version_check(info, mp, lname, child_fid, 1);
if (rc != 0)
GOTO(out_unlock_parent, rc);
mdt_set_capainfo(info, 1, child_fid, BYPASS_CAPA);
rc = mdo_unlink(info->mti_env, mdt_object_child(mp),
mdt_object_child(mc), lname, ma);
+ if (rc == 0 && !lu_object_is_dying(&mc->mot_header))
+ rc = mdt_attr_get_complex(info, mc, ma);
if (rc == 0)
mdt_handle_last_unlink(info, mc, ma);
if (ma->ma_valid & MA_INODE) {
switch (ma->ma_attr.la_mode & S_IFMT) {
case S_IFDIR:
- mdt_counter_incr(req->rq_export, LPROC_MDT_RMDIR);
+ mdt_counter_incr(req, LPROC_MDT_RMDIR);
break;
case S_IFREG:
case S_IFLNK:
case S_IFBLK:
case S_IFIFO:
case S_IFSOCK:
- mdt_counter_incr(req->rq_export, LPROC_MDT_UNLINK);
+ mdt_counter_incr(req, LPROC_MDT_UNLINK);
break;
default:
LASSERTF(0, "bad file type %o unlinking\n",
if (info->mti_dlm_req)
ldlm_request_cancel(req, info->mti_dlm_req, 0);
- if (info->mti_cross_ref) {
- /* MDT holding name ask us to add ref. */
- lhs = &info->mti_lh[MDT_LH_CHILD];
- mdt_lock_reg_init(lhs, LCK_EX);
- ms = mdt_object_find_lock(info, rr->rr_fid1, lhs,
- MDS_INODELOCK_UPDATE);
- if (IS_ERR(ms))
- RETURN(PTR_ERR(ms));
-
- mdt_set_capainfo(info, 0, rr->rr_fid1, BYPASS_CAPA);
- rc = mo_ref_add(info->mti_env, mdt_object_child(ms), ma);
- mdt_object_unlock_put(info, ms, lhs, rc);
- RETURN(rc);
- }
-
/* Invalid case so return error immediately instead of
* processing it */
if (lu_fid_eq(rr->rr_fid1, rr->rr_fid2))
if (IS_ERR(mp))
RETURN(PTR_ERR(mp));
+ if (mdt_object_obf(mp))
+ GOTO(out_unlock_parent, rc = -EPERM);
+
rc = mdt_version_get_check_save(info, mp, 0);
if (rc)
GOTO(out_unlock_parent, rc);
mdt_object_child(ms), lname, ma);
if (rc == 0)
- mdt_counter_incr(req->rq_export, LPROC_MDT_LINK);
+ mdt_counter_incr(req, LPROC_MDT_LINK);
EXIT;
out_unlock_child:
return rc;
}
-/* partial operation for rename */
-static int mdt_reint_rename_tgt(struct mdt_thread_info *info)
-{
- struct mdt_reint_record *rr = &info->mti_rr;
- struct ptlrpc_request *req = mdt_info_req(info);
- struct md_attr *ma = &info->mti_attr;
- struct mdt_object *mtgtdir;
- struct mdt_object *mtgt = NULL;
- struct mdt_lock_handle *lh_tgtdir;
- struct mdt_lock_handle *lh_tgt = NULL;
- struct lu_fid *tgt_fid = &info->mti_tmp_fid1;
- struct lu_name *lname;
- int rc;
- ENTRY;
-
- DEBUG_REQ(D_INODE, req, "rename_tgt: insert (%s->"DFID") in "DFID,
- rr->rr_tgt, PFID(rr->rr_fid2), PFID(rr->rr_fid1));
-
- /* step 1: lookup & lock the tgt dir. */
- lh_tgtdir = &info->mti_lh[MDT_LH_PARENT];
- mdt_lock_pdo_init(lh_tgtdir, LCK_PW, rr->rr_tgt,
- rr->rr_tgtlen);
- mtgtdir = mdt_object_find_lock(info, rr->rr_fid1, lh_tgtdir,
- MDS_INODELOCK_UPDATE);
- if (IS_ERR(mtgtdir))
- RETURN(PTR_ERR(mtgtdir));
-
- /* step 2: find & lock the target object if exists. */
- mdt_set_capainfo(info, 0, rr->rr_fid1, BYPASS_CAPA);
- lname = mdt_name(info->mti_env, (char *)rr->rr_tgt, rr->rr_tgtlen);
- rc = mdo_lookup(info->mti_env, mdt_object_child(mtgtdir),
- lname, tgt_fid, &info->mti_spec);
- if (rc != 0 && rc != -ENOENT) {
- GOTO(out_unlock_tgtdir, rc);
- } else if (rc == 0) {
- /*
- * In case of replay that name can be already inserted, check
- * that and do nothing if so.
- */
- if (lu_fid_eq(tgt_fid, rr->rr_fid2))
- GOTO(out_unlock_tgtdir, rc);
-
- lh_tgt = &info->mti_lh[MDT_LH_CHILD];
- mdt_lock_reg_init(lh_tgt, LCK_EX);
-
- mtgt = mdt_object_find_lock(info, tgt_fid, lh_tgt,
- MDS_INODELOCK_LOOKUP);
- if (IS_ERR(mtgt))
- GOTO(out_unlock_tgtdir, rc = PTR_ERR(mtgt));
-
- mdt_reint_init_ma(info, ma);
- if (!ma->ma_lmm || !ma->ma_cookie)
- GOTO(out_unlock_tgt, rc = -EINVAL);
-
- rc = mdo_rename_tgt(info->mti_env, mdt_object_child(mtgtdir),
- mdt_object_child(mtgt), rr->rr_fid2,
- lname, ma);
- } else /* -ENOENT */ {
- rc = mdo_name_insert(info->mti_env, mdt_object_child(mtgtdir),
- lname, rr->rr_fid2, ma);
- }
-
- /* handle last link of tgt object */
- if (rc == 0 && mtgt)
- mdt_handle_last_unlink(info, mtgt, ma);
-
- EXIT;
-out_unlock_tgt:
- if (mtgt)
- mdt_object_unlock_put(info, mtgt, lh_tgt, rc);
-out_unlock_tgtdir:
- mdt_object_unlock_put(info, mtgtdir, lh_tgtdir, rc);
- return rc;
-}
-
static int mdt_rename_lock(struct mdt_thread_info *info,
struct lustre_handle *lh)
{
struct ldlm_namespace *ns = info->mti_mdt->mdt_namespace;
ldlm_policy_data_t *policy = &info->mti_policy;
struct ldlm_res_id *res_id = &info->mti_res_id;
+ __u64 flags = 0;
struct md_site *ms;
int rc;
ENTRY;
policy->l_inodebits.bits = MDS_INODELOCK_UPDATE;
if (ms->ms_control_exp == NULL) {
- int flags = LDLM_FL_LOCAL_ONLY | LDLM_FL_ATOMIC_CB;
+ flags = LDLM_FL_LOCAL_ONLY | LDLM_FL_ATOMIC_CB;
/*
* Current node is controller, that is mdt0, where we should
rc = ldlm_cli_enqueue_local(ns, res_id, LDLM_IBITS, policy,
LCK_EX, &flags, ldlm_blocking_ast,
ldlm_completion_ast, NULL, NULL, 0,
- &info->mti_exp->exp_handle.h_cookie,
+ LVB_T_NONE,
+ &info->mti_exp->exp_handle.h_cookie,
lh);
} else {
struct ldlm_enqueue_info einfo = { LDLM_IBITS, LCK_EX,
ldlm_blocking_ast, ldlm_completion_ast, NULL, NULL, NULL };
- int flags = 0;
-
/*
* This is the case mdt0 is remote node, issue DLM lock like
* other clients.
*/
rc = ldlm_cli_enqueue(ms->ms_control_exp, NULL, &einfo, res_id,
- policy, &flags, NULL, 0, lh, 0);
+ policy, &flags, NULL, 0, LVB_T_NONE, lh,
+ 0);
}
RETURN(rc);
if (info->mti_dlm_req)
ldlm_request_cancel(req, info->mti_dlm_req, 0);
- if (info->mti_cross_ref) {
- rc = mdt_reint_rename_tgt(info);
- RETURN(rc);
- }
-
DEBUG_REQ(D_INODE, req, "rename "DFID"/%s to "DFID"/%s",
PFID(rr->rr_fid1), rr->rr_name,
PFID(rr->rr_fid2), rr->rr_tgt);
if (IS_ERR(msrcdir))
GOTO(out_rename_lock, rc = PTR_ERR(msrcdir));
+ if (mdt_object_obf(msrcdir))
+ GOTO(out_unlock_source, rc = -EPERM);
+
rc = mdt_version_get_check_save(info, msrcdir, 0);
if (rc)
GOTO(out_unlock_source, rc);
if (IS_ERR(mtgtdir))
GOTO(out_unlock_source, rc = PTR_ERR(mtgtdir));
+ if (mdt_object_obf(mtgtdir))
+ GOTO(out_put_target, rc = -EPERM);
+
/* check early, the real version will be saved after locking */
rc = mdt_version_get_check(info, mtgtdir, 1);
if (rc)
/* step 3: find & lock the old object. */
lname = mdt_name(info->mti_env, (char *)rr->rr_name, rr->rr_namelen);
mdt_name_copy(&slname, lname);
+ fid_zero(old_fid);
rc = mdt_lookup_version_check(info, msrcdir, &slname, old_fid, 2);
if (rc != 0)
GOTO(out_unlock_target, rc);
if (IS_ERR(mold))
GOTO(out_unlock_target, rc = PTR_ERR(mold));
+ if (mdt_object_obf(mold)) {
+ mdt_object_put(info->mti_env, mold);
+ GOTO(out_unlock_target, rc = -EPERM);
+ }
+
lh_oldp = &info->mti_lh[MDT_LH_OLD];
mdt_lock_reg_init(lh_oldp, LCK_EX);
rc = mdt_object_lock(info, mold, lh_oldp, MDS_INODELOCK_LOOKUP,
/* new target object may not exist now */
lname = mdt_name(info->mti_env, (char *)rr->rr_tgt, rr->rr_tgtlen);
/* lookup with version checking */
+ fid_zero(new_fid);
rc = mdt_lookup_version_check(info, mtgtdir, lname, new_fid, 3);
if (rc == 0) {
/* the new_fid should have been filled at this moment */
if (IS_ERR(mnew))
GOTO(out_unlock_old, rc = PTR_ERR(mnew));
+ if (mdt_object_obf(mnew)) {
+ mdt_object_put(info->mti_env, mnew);
+ GOTO(out_unlock_old, rc = -EPERM);
+ }
+
rc = mdt_object_lock(info, mnew, lh_newp,
MDS_INODELOCK_FULL, MDT_CROSS_LOCK);
if (rc != 0) {
/* step 5: rename it */
mdt_reint_init_ma(info, ma);
- if (!ma->ma_lmm || !ma->ma_cookie)
- GOTO(out_unlock_new, rc = -EINVAL);
mdt_fail_write(info->mti_env, info->mti_mdt->mdt_bottom,
OBD_FAIL_MDS_REINT_RENAME_WRITE);
/* handle last link of tgt object */
if (rc == 0) {
- mdt_counter_incr(req->rq_export, LPROC_MDT_RENAME);
+ mdt_counter_incr(req, LPROC_MDT_RENAME);
if (mnew)
mdt_handle_last_unlink(info, mnew, ma);
+
+ mdt_rename_counter_tally(info, info->mti_mdt, req,
+ msrcdir, mtgtdir);
}
EXIT;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff