#include <linux/lustre_dlm.h>
#include <linux/obd_class.h>
+extern inline struct mds_obd *mds_req2mds(struct ptlrpc_request *req);
+
struct mds_client_info *mds_uuid_to_mci(struct mds_obd *mds, __u8 *uuid)
{
struct list_head *p;
return rc;
}
+/* In the write-back case, the client holds a lock on a subtree.
+ * In the intent case, the client holds a lock on the child inode.
+ * In the pathname case, the client (may) hold a lock on the child inode. */
static int mds_reint_setattr(struct mds_update_record *rec, int offset,
struct ptlrpc_request *req)
{
- struct mds_obd *mds = &req->rq_obd->u.mds;
+ struct mds_obd *mds = mds_req2mds(req);
struct dentry *de;
void *handle;
- int rc = 0;
- int err;
+ struct lustre_handle child_lockh;
+ int rc = 0, err;
+
+ if (req->rq_reqmsg->bufcount > offset + 1) {
+ struct dentry *dir;
+ struct lustre_handle dir_lockh;
+ char *name;
+ int namelen;
+
+ /* a name was supplied by the client; fid1 is the directory */
+ dir = mds_fid2locked_dentry(mds, rec->ur_fid1, NULL, LCK_PR,
+ &dir_lockh);
+ if (!dir || IS_ERR(dir)) {
+ l_dput(dir);
+ LBUG();
+ GOTO(out_setattr, rc = -ESTALE);
+ }
- de = mds_fid2dentry(mds, rec->ur_fid1, NULL);
- if (IS_ERR(de) || OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_SETATTR)) {
- GOTO(out_setattr, rc = -ESTALE);
+ name = lustre_msg_buf(req->rq_reqmsg, offset + 1);
+ namelen = req->rq_reqmsg->buflens[offset + 1] - 1;
+ de = mds_name2locked_dentry(mds, dir, NULL, name, namelen,
+ 0, &child_lockh, LCK_PR);
+ l_dput(dir);
+ if (!de || IS_ERR(de)) {
+ LBUG();
+ GOTO(out_setattr_de, rc = -ESTALE);
+ }
+ } else {
+ de = mds_fid2dentry(mds, rec->ur_fid1, NULL);
+ if (!de || IS_ERR(de)) {
+ LBUG();
+ GOTO(out_setattr_de, rc = -ESTALE);
+ }
}
-
CDEBUG(D_INODE, "ino %ld\n", de->d_inode->i_ino);
OBD_FAIL_WRITE(OBD_FAIL_MDS_REINT_SETATTR_WRITE,
de->d_inode->i_sb->s_dev);
+ lock_kernel();
handle = mds_fs_start(mds, de->d_inode, MDS_FSOP_SETATTR);
if (!handle)
- GOTO(out_setattr_de, rc = PTR_ERR(handle));
+ GOTO(out_unlock, rc = PTR_ERR(handle));
rc = mds_fs_setattr(mds, de, handle, &rec->ur_iattr);
if (!rc)
if (!rc)
rc = err;
}
+
EXIT;
-out_setattr_de:
+ out_unlock:
+ unlock_kernel();
+ out_setattr_de:
l_dput(de);
-out_setattr:
+ out_setattr:
req->rq_status = rc;
return(0);
}
struct ptlrpc_request *req)
{
struct dentry *de = NULL;
- struct mds_obd *mds = &req->rq_obd->u.mds;
+ struct mds_obd *mds = mds_req2mds(req);
struct dentry *dchild = NULL;
struct inode *dir;
int rc = 0;
struct ptlrpc_request *req)
{
struct dentry *de = NULL;
- struct mds_obd *mds = &req->rq_obd->u.mds;
+ struct mds_obd *mds = mds_req2mds(req);
struct dentry *dchild = NULL;
struct inode *dir;
void *handle;
if (offset)
offset = 1;
- if (strcmp(req->rq_obd->obd_type->typ_name, "mds") != 0)
+ if (strcmp(req->rq_export->exp_obd->obd_type->typ_name, "mds") != 0)
LBUG();
de = mds_fid2dentry(mds, rec->ur_fid1, NULL);
if (rc == 0) {
LDLM_DEBUG_NOLOCK("enqueue res %Lu", res_id[0]);
rc = ldlm_cli_enqueue(mds->mds_ldlm_client, mds->mds_ldlm_conn,
+ (struct lustre_handle *)&mds->mds_connh,
NULL, mds->mds_local_namespace, NULL,
res_id, LDLM_PLAIN, NULL, 0, lock_mode,
&flags, (void *)mds_lock_callback, NULL,
if (dchild->d_inode) {
struct mds_body *body;
- struct obdo *obdo;
struct inode *inode = dchild->d_inode;
+ struct lov_stripe_md *md;
CDEBUG(D_INODE, "child exists (dir %ld, name %s, ino %ld)\n",
dir->i_ino, rec->ur_name, dchild->d_inode->i_ino);
#warning FIXME: This ext3/N-specific code does not belong here
/* If i_file_acl is set, this inode has an EA */
if (S_ISREG(inode->i_mode) && inode->u.ext3_i.i_file_acl) {
- obdo = lustre_msg_buf(req->rq_repmsg, offset + 1);
- mds_fs_get_obdo(mds, inode, obdo);
+ md = lustre_msg_buf(req->rq_repmsg, offset + 1);
+ md->lmd_size = mds->mds_max_mdsize;
+ mds_fs_get_md(mds, inode, md);
}
/* now a normal case for intent locking */
GOTO(out_create_dchild, rc = -EEXIST);
break;
}
default:
- CERROR("bad file type %d for create of %s\n",type,rec->ur_name);
+ CERROR("bad file type %o for create of %s\n",type,rec->ur_name);
GOTO(out_create_dchild, rc = -EINVAL);
}
CDEBUG(D_INODE, "created ino %ld\n", dchild->d_inode->i_ino);
if (!offset && type == S_IFREG) {
- struct obdo *obdo;
- obdo = lustre_msg_buf(req->rq_reqmsg, 2);
- rc = mds_fs_set_obdo(mds, inode, handle, obdo);
+ struct lov_stripe_md *md;
+ md = lustre_msg_buf(req->rq_reqmsg, 2);
+ rc = mds_fs_set_md(mds, inode, handle, md);
if (rc) {
CERROR("error %d setting obdo for %ld\n",
rc, inode->i_ino);
{
struct dentry *de = NULL;
struct dentry *dchild = NULL;
- struct mds_obd *mds = &req->rq_obd->u.mds;
- struct obdo *obdo;
+ struct mds_obd *mds = mds_req2mds(req);
+ char *name;
+ int namelen;
struct inode *dir, *inode;
- int lock_mode, flags;
- __u64 res_id[3] = {0};
- struct lustre_handle lockh;
+ int lock_mode;
+ struct lustre_handle lockh, child_lockh;
void *handle;
int rc = 0;
int err;
ENTRY;
- de = mds_fid2dentry(mds, rec->ur_fid1, NULL);
- if (IS_ERR(de) || OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_UNLINK)) {
+ /* a name was supplied by the client; fid1 is the directory */
+ lock_mode = (req->rq_reqmsg->opc == MDS_REINT) ? LCK_CW : LCK_PW;
+ de = mds_fid2locked_dentry(mds, rec->ur_fid1, NULL, lock_mode,
+ &lockh);
+ if (!de || IS_ERR(de)) {
LBUG();
- GOTO(out_unlink, rc = -ESTALE);
+ RETURN(-ESTALE);
}
+
+ name = lustre_msg_buf(req->rq_reqmsg, offset + 1);
+ namelen = req->rq_reqmsg->buflens[offset + 1] - 1;
+ dchild = mds_name2locked_dentry(mds, de, NULL, name, namelen,
+ LCK_EX, &child_lockh, lock_mode);
- dir = de->d_inode;
- CDEBUG(D_INODE, "parent ino %ld\n", dir->i_ino);
- lock_mode = (req->rq_reqmsg->opc == MDS_REINT) ? LCK_CW : LCK_PW;
- res_id[0] = dir->i_ino;
-
- rc = ldlm_lock_match(mds->mds_local_namespace, res_id, LDLM_PLAIN,
- NULL, 0, lock_mode, &lockh);
- if (rc == 0) {
- LDLM_DEBUG_NOLOCK("enqueue res %Lu", res_id[0]);
- rc = ldlm_cli_enqueue(mds->mds_ldlm_client, mds->mds_ldlm_conn,
- NULL, mds->mds_local_namespace, NULL,
- res_id, LDLM_PLAIN, NULL, 0, lock_mode,
- &flags, (void *)mds_lock_callback, NULL,
- 0, &lockh);
- if (rc != ELDLM_OK) {
- CERROR("lock enqueue: err: %d\n", rc);
- GOTO(out_unlink_de, rc = -EIO);
- }
- } else
-
- ldlm_lock_dump((void *)(unsigned long)lockh.addr);
-
- down(&dir->i_sem);
- dchild = lookup_one_len(rec->ur_name, de, rec->ur_namelen - 1);
- if (IS_ERR(dchild)) {
- CERROR("child lookup error %ld\n", PTR_ERR(dchild));
+ if (!dchild || IS_ERR(dchild)
+ || OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_UNLINK)) {
LBUG();
- GOTO(out_unlink_de, rc = -ESTALE);
+ GOTO(out_unlink, rc = -ESTALE);
}
+ dir = de->d_inode;
inode = dchild->d_inode;
+ CDEBUG(D_INODE, "parent ino %ld\n", dir->i_ino);
+
if (!inode) {
- CERROR("child doesn't exist (dir %ld, name %s\n",
+ CDEBUG(D_INODE, "child doesn't exist (dir %ld, name %s\n",
dir->i_ino, rec->ur_name);
GOTO(out_unlink_dchild, rc = -ENOENT);
+ } else if (offset) {
+ struct mds_body *body = lustre_msg_buf(req->rq_repmsg, 1);
+ mds_pack_inode2fid(&body->fid1, inode);
+ mds_pack_inode2body(body, inode);
}
-#if 0 /* in intent case the client doesn't have the inode */
- if (inode->i_ino != rec->ur_fid2->id) {
- CERROR("inode and FID ID do not match (%ld != %Ld)\n",
- inode->i_ino, rec->ur_fid2->id);
- LBUG();
- GOTO(out_unlink_dchild, rc = -ESTALE);
- }
- if (inode->i_generation != rec->ur_fid2->generation) {
- CERROR("inode and FID GENERATION do not match (%d != %d)\n",
- inode->i_generation, rec->ur_fid2->generation);
- LBUG();
- GOTO(out_unlink_dchild, rc = -ESTALE);
- }
-#endif
-
OBD_FAIL_WRITE(OBD_FAIL_MDS_REINT_UNLINK_WRITE, dir->i_sb->s_dev);
- switch (dchild->d_inode->i_mode & S_IFMT) {
+ switch (inode->i_mode & S_IFMT) {
case S_IFDIR:
handle = mds_fs_start(mds, dir, MDS_FSOP_RMDIR);
if (!handle)
- GOTO(out_unlink_dchild, rc = PTR_ERR(handle));
+ GOTO(out_unlink_cancel, rc = PTR_ERR(handle));
rc = vfs_rmdir(dir, dchild);
break;
- default:
- if (offset) {
- obdo = lustre_msg_buf(req->rq_repmsg, 1);
- rc = mds_fs_get_obdo(mds, inode, obdo);
- if (rc < 0)
- CDEBUG(D_INFO, "No obdo for ino %ld err %d\n",
+ case S_IFREG:
+ if (inode->u.ext3_i.i_file_acl && offset) {
+ struct lov_stripe_md *md;
+ md = lustre_msg_buf(req->rq_repmsg, 2);
+ rc = mds_fs_get_md(mds, inode, md);
+ if (rc < 0) {
+ CDEBUG(D_INFO, "No md for ino %ld err %d\n",
inode->i_ino, rc);
+ memset(md, 0, md->lmd_size);
+ }
}
-
+ default:
handle = mds_fs_start(mds, dir, MDS_FSOP_UNLINK);
if (!handle)
- GOTO(out_unlink_dchild, rc = PTR_ERR(handle));
+ GOTO(out_unlink_cancel, rc = PTR_ERR(handle));
rc = vfs_unlink(dir, dchild);
break;
}
}
EXIT;
+
+ out_unlink_cancel:
+ ldlm_lock_decref(&child_lockh, LCK_EX);
+ rc = ldlm_cli_cancel(&child_lockh);
+ if (rc < 0)
+ CERROR("failed to cancel child inode lock ino\n");
out_unlink_dchild:
- if (!rc)
- res_id[0] = inode->i_ino;
l_dput(dchild);
-out_unlink_de:
+out_unlink:
up(&dir->i_sem);
- ldlm_lock_decref(&lockh
-, lock_mode);
- if (!rc) {
- /* Take an exclusive lock on the resource that we're
- * about to free, to force everyone to drop their
- * locks. */
- LDLM_DEBUG_NOLOCK("getting EX lock res %Lu", res_id[0]);
- rc = ldlm_cli_enqueue(mds->mds_ldlm_client, mds->mds_ldlm_conn,
- NULL, mds->mds_local_namespace, NULL,
- res_id,
- LDLM_PLAIN, NULL, 0, LCK_EX, &flags,
- (void *)mds_lock_callback, NULL, 0,
- &lockh);
- if (rc)
- CERROR("failed to get child inode lock (child ino %Ld, "
- "dir ino %ld)\n",
- res_id[0], de->d_inode->i_ino);
- }
-
+ ldlm_lock_decref(&lockh, lock_mode);
l_dput(de);
-
- if (!rc) {
- ldlm_lock_decref(&lockh, LCK_EX);
- rc = ldlm_cli_cancel(&lockh);
- if (rc < 0)
- CERROR("failed to cancel child inode lock ino "
- "%Ld: %d\n", res_id[0], rc);
- }
-
-out_unlink:
req->rq_status = rc;
return 0;
}
struct dentry *de_src = NULL;
struct dentry *de_tgt_dir = NULL;
struct dentry *dchild = NULL;
- struct mds_obd *mds = &req->rq_obd->u.mds;
+ struct mds_obd *mds = mds_req2mds(req);
void *handle;
int rc = 0;
int err;
struct dentry *de_tgtdir = NULL;
struct dentry *de_old = NULL;
struct dentry *de_new = NULL;
- struct mds_obd *mds = &req->rq_obd->u.mds;
+ struct mds_obd *mds = mds_req2mds(req);
+ struct lustre_handle tgtlockh, srclockh, oldhandle;
+ int flags, lock_mode, rc = 0, err;
void *handle;
- int rc = 0;
- int err;
+ __u64 res_id[3] = {0};
ENTRY;
de_srcdir = mds_fid2dentry(mds, rec->ur_fid1, NULL);
- if (IS_ERR(de_srcdir)) {
+ if (IS_ERR(de_srcdir))
GOTO(out_rename, rc = -ESTALE);
- }
+
+ lock_mode = (req->rq_reqmsg->opc == MDS_REINT) ? LCK_CW : LCK_PW;
+ res_id[0] = de_srcdir->d_inode->i_ino;
+
+ rc = ldlm_lock_match(mds->mds_local_namespace, res_id, LDLM_PLAIN,
+ NULL, 0, lock_mode, &srclockh);
+ if (rc == 0) {
+ LDLM_DEBUG_NOLOCK("enqueue res %Lu", res_id[0]);
+ rc = ldlm_cli_enqueue(mds->mds_ldlm_client, mds->mds_ldlm_conn,
+ (struct lustre_handle *)&mds->mds_connh,
+ NULL, mds->mds_local_namespace, NULL,
+ res_id, LDLM_PLAIN, NULL, 0, lock_mode,
+ &flags, (void *)mds_lock_callback, NULL,
+ 0, &srclockh);
+ if (rc != ELDLM_OK) {
+ CERROR("lock enqueue: err: %d\n", rc);
+ GOTO(out_rename_srcput, rc = -EIO);
+ }
+ } else
+ ldlm_lock_dump((void *)(unsigned long)srclockh.addr);
de_tgtdir = mds_fid2dentry(mds, rec->ur_fid2, NULL);
- if (IS_ERR(de_tgtdir)) {
+ if (IS_ERR(de_tgtdir))
GOTO(out_rename_srcdir, rc = -ESTALE);
- }
-#warning FIXME: This needs locking attention
+ lock_mode = (req->rq_reqmsg->opc == MDS_REINT) ? LCK_CW : LCK_PW;
+ res_id[0] = de_tgtdir->d_inode->i_ino;
+
+ rc = ldlm_lock_match(mds->mds_local_namespace, res_id, LDLM_PLAIN,
+ NULL, 0, lock_mode, &tgtlockh);
+ if (rc == 0) {
+ LDLM_DEBUG_NOLOCK("enqueue res %Lu", res_id[0]);
+ rc = ldlm_cli_enqueue(mds->mds_ldlm_client, mds->mds_ldlm_conn,
+ (struct lustre_handle *)&mds->mds_connh,
+ NULL, mds->mds_local_namespace, NULL,
+ res_id, LDLM_PLAIN, NULL, 0, lock_mode,
+ &flags, (void *)mds_lock_callback, NULL,
+ 0, &tgtlockh);
+ if (rc != ELDLM_OK) {
+ CERROR("lock enqueue: err: %d\n", rc);
+ GOTO(out_rename_tgtput, rc = -EIO);
+ }
+ } else
+ ldlm_lock_dump((void *)(unsigned long)tgtlockh.addr);
+
+ double_lock(de_tgtdir, de_srcdir);
de_old = lookup_one_len(rec->ur_name, de_srcdir, rec->ur_namelen - 1);
if (IS_ERR(de_old)) {
- CERROR("old child lookup error %ld\n", PTR_ERR(de_old));
- GOTO(out_rename_tgtdir, rc = -ESTALE);
+ CERROR("old child lookup error (%*s): %ld\n",
+ rec->ur_namelen - 1, rec->ur_name, PTR_ERR(de_old));
+ GOTO(out_rename_tgtdir, rc = -ENOENT);
}
de_new = lookup_one_len(rec->ur_tgt, de_tgtdir, rec->ur_tgtlen - 1);
if (IS_ERR(de_new)) {
- CERROR("new child lookup error %ld\n", PTR_ERR(de_new));
- GOTO(out_rename_deold, rc = -ESTALE);
+ CERROR("new child lookup error (%*s): %ld\n",
+ rec->ur_tgtlen - 1, rec->ur_tgt, PTR_ERR(de_new));
+ GOTO(out_rename_deold, rc = -ENOENT);
}
OBD_FAIL_WRITE(OBD_FAIL_MDS_REINT_RENAME_WRITE,
handle = mds_fs_start(mds, de_tgtdir->d_inode, MDS_FSOP_RENAME);
if (!handle)
GOTO(out_rename_denew, rc = PTR_ERR(handle));
+ lock_kernel();
rc = vfs_rename(de_srcdir->d_inode, de_old, de_tgtdir->d_inode, de_new,
NULL);
+ unlock_kernel();
if (!rc)
rc = mds_update_last_rcvd(mds, handle, req);
out_rename_denew:
l_dput(de_new);
out_rename_deold:
+ if (!rc) {
+ res_id[0] = de_old->d_inode->i_ino;
+ /* Take an exclusive lock on the resource that we're
+ * about to free, to force everyone to drop their
+ * locks. */
+ LDLM_DEBUG_NOLOCK("getting EX lock res %Lu", res_id[0]);
+ rc = ldlm_cli_enqueue(mds->mds_ldlm_client, mds->mds_ldlm_conn,
+ (struct lustre_handle *)&mds->mds_connh,
+ NULL, mds->mds_local_namespace, NULL,
+ res_id,
+ LDLM_PLAIN, NULL, 0, LCK_EX, &flags,
+ (void *)mds_lock_callback, NULL, 0,
+ &oldhandle);
+ if (rc)
+ CERROR("failed to get child inode lock (child ino %Ld, "
+ "dir ino %ld)\n",
+ res_id[0], de_old->d_inode->i_ino);
+ }
+
l_dput(de_old);
-out_rename_tgtdir:
+
+ if (!rc) {
+ ldlm_lock_decref(&oldhandle, LCK_EX);
+ rc = ldlm_cli_cancel(&oldhandle);
+ if (rc < 0)
+ CERROR("failed to cancel child inode lock ino "
+ "%Ld: %d\n", res_id[0], rc);
+ }
+ out_rename_tgtdir:
+ double_up(&de_srcdir->d_inode->i_sem, &de_tgtdir->d_inode->i_sem);
+ ldlm_lock_decref(&tgtlockh, lock_mode);
+ out_rename_tgtput:
l_dput(de_tgtdir);
-out_rename_srcdir:
+ out_rename_srcdir:
+ ldlm_lock_decref(&srclockh, lock_mode);
+ out_rename_srcput:
l_dput(de_srcdir);
-out_rename:
+ out_rename:
req->rq_status = rc;
return 0;
}
int mds_reint_rec(struct mds_update_record *rec, int offset,
struct ptlrpc_request *req)
{
- struct mds_obd *mds = &req->rq_obd->u.mds;
+ struct mds_obd *mds = mds_req2mds(req);
struct obd_run_ctxt saved;
int rc;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff