#include <linux/lustre_mds.h>
#include <linux/obd_class.h>
+struct mds_client_info *mds_uuid_to_mci(struct mds_obd *mds, __u8 *uuid)
+{
+ struct list_head *p;
+
+ if (!uuid)
+ return NULL;
+
+ list_for_each(p, &mds->mds_client_info) {
+ struct mds_client_info *mci;
+
+ mci = list_entry(p, struct mds_client_info, mci_list);
+ CDEBUG(D_INFO, "checking client UUID '%s'\n",
+ mci->mci_mcd->mcd_uuid);
+ if (!strncmp(mci->mci_mcd->mcd_uuid, uuid,
+ sizeof(mci->mci_mcd->mcd_uuid)))
+ return mci;
+ }
+ CDEBUG(D_INFO, "no client UUID found for '%s'\n", uuid);
+ return NULL;
+}
+
+int mds_update_last_rcvd(struct mds_obd *mds, void *handle,
+ struct ptlrpc_request *req)
+{
+ /* get from req->rq_connection-> or req->rq_client */
+ struct mds_client_info *mci;
+ loff_t off;
+ int rc;
+
+ mci = mds_uuid_to_mci(mds, req->rq_connection->c_remote_uuid);
+ if (!mci) {
+ CERROR("unable to locate MDS client data for UUID '%s'\n",
+ ptlrpc_req_to_uuid(req));
+ /* This will be a real error once everything is working */
+ //LBUG();
+ RETURN(0);
+ }
+
+ off = MDS_LR_CLIENT + mci->mci_off * MDS_LR_SIZE;
+
+ ++mds->mds_last_rcvd; /* lock this, or make it an LDLM function? */
+ mci->mci_mcd->mcd_last_rcvd = cpu_to_le64(mds->mds_last_rcvd);
+ mci->mci_mcd->mcd_mount_count = cpu_to_le64(mds->mds_mount_count);
+ mci->mci_mcd->mcd_last_xid = cpu_to_le32(req->rq_reqmsg->xid);
+
+ mds_fs_set_last_rcvd(mds, handle);
+ rc = lustre_fwrite(mds->mds_rcvd_filp, (char *)mci->mci_mcd,
+ sizeof(*mci->mci_mcd), &off);
+ CDEBUG(D_INODE, "wrote trans #%Ld for client '%s' at #%d: rc = %d\n",
+ mds->mds_last_rcvd, mci->mci_mcd->mcd_uuid, mci->mci_off, rc);
+ // store new value and last committed value in req struct
+
+ if (rc == sizeof(mci->mci_mcd))
+ rc = 0;
+ else if (rc >= 0)
+ rc = -EIO;
+
+ return rc;
+}
+
static int mds_reint_setattr(struct mds_update_record *rec,
struct ptlrpc_request *req)
{
struct mds_obd *mds = &req->rq_obd->u.mds;
struct dentry *de;
+ void *handle;
+ int rc = 0;
de = mds_fid2dentry(mds, rec->ur_fid1, NULL);
if (IS_ERR(de) || OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_SETATTR)) {
- req->rq_status = -ESTALE;
- RETURN(0);
+ GOTO(out_setattr, 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);
- req->rq_status = mds_fs_setattr(mds, de, NULL, &rec->ur_iattr);
+ handle = mds_fs_start(mds, de->d_inode, MDS_FSOP_SETATTR);
+ if (!handle)
+ GOTO(out_setattr_de, rc = PTR_ERR(handle));
+ rc = mds_fs_setattr(mds, de, handle, &rec->ur_iattr);
+ if (!rc)
+ rc = mds_update_last_rcvd(mds, handle, req);
+ /* FIXME: need to return last_rcvd, last_committed */
+
+ EXIT;
+
+ /* FIXME: keep rc intact */
+ rc = mds_fs_commit(mds, de->d_inode, handle);
+out_setattr_de:
l_dput(de);
- RETURN(0);
+out_setattr:
+ req->rq_status = rc;
+ return(0);
}
static int mds_reint_create(struct mds_update_record *rec,
GOTO(out_create_de, rc = -ESTALE);
}
dir = de->d_inode;
- CDEBUG(D_INODE, "ino %ld\n", dir->i_ino);
+ CDEBUG(D_INODE, "parent ino %ld\n", dir->i_ino);
down(&dir->i_sem);
dchild = lookup_one_len(rec->ur_name, de, rec->ur_namelen - 1);
}
if (dchild->d_inode) {
- CERROR("child exists (dir %ld, name %s)\n",
- dir->i_ino, rec->ur_name);
+ CERROR("child exists (dir %ld, name %s, ino %ld)\n",
+ dir->i_ino, rec->ur_name, dchild->d_inode->i_ino);
LBUG();
GOTO(out_create_dchild, rc = -EEXIST);
}
struct inode *inode = dchild->d_inode;
struct mds_body *body;
+ CDEBUG(D_INODE, "created ino %ld\n", dchild->d_inode->i_ino);
if (type == S_IFREG) {
rc = mds_fs_set_objid(mds, inode, handle, rec->ur_id);
if (rc)
rc = mds_fs_setattr(mds, dchild, handle, &iattr);
/* XXX should we abort here in case of error? */
+ //if (!rc)
+ rc = mds_update_last_rcvd(mds, handle, req);
+
body = lustre_msg_buf(req->rq_repmsg, 0);
body->ino = inode->i_ino;
body->generation = inode->i_generation;
+ body->last_rcvd = mds->mds_last_rcvd;
+ body->last_committed = mds->mds_last_committed;
}
out_create_commit:
struct dentry *dchild = NULL;
struct mds_obd *mds = &req->rq_obd->u.mds;
struct inode *dir, *inode;
+ void *handle;
int rc = 0;
ENTRY;
GOTO(out_unlink, rc = -ESTALE);
}
dir = de->d_inode;
- CDEBUG(D_INODE, "ino %ld\n", dir->i_ino);
+ CDEBUG(D_INODE, "parent ino %ld\n", dir->i_ino);
down(&dir->i_sem);
dchild = lookup_one_len(rec->ur_name, de, rec->ur_namelen - 1);
switch (dchild->d_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));
rc = vfs_rmdir(dir, dchild);
- EXIT;
break;
default:
+ handle = mds_fs_start(mds, dir, MDS_FSOP_UNLINK);
+ if (!handle)
+ GOTO(out_unlink_dchild, rc = PTR_ERR(handle));
rc = vfs_unlink(dir, dchild);
- EXIT;
break;
}
+ if (!rc)
+ rc = mds_update_last_rcvd(mds, handle, req);
+ /* FIXME: need to return last_rcvd, last_committed */
+ /* FIXME: keep rc intact */
+ rc = mds_fs_commit(mds, dir, handle);
+
EXIT;
out_unlink_dchild:
l_dput(dchild);
struct dentry *de_tgt_dir = NULL;
struct dentry *dchild = NULL;
struct mds_obd *mds = &req->rq_obd->u.mds;
+ void *handle;
int rc = 0;
ENTRY;
OBD_FAIL_WRITE(OBD_FAIL_MDS_REINT_LINK_WRITE,
dchild->d_inode->i_sb->s_dev);
+ handle = mds_fs_start(mds, de_tgt_dir->d_inode, MDS_FSOP_LINK);
+ if (!handle)
+ GOTO(out_link_dchild, rc = PTR_ERR(handle));
+
rc = vfs_link(de_src, de_tgt_dir->d_inode, dchild);
+
+ if (!rc)
+ rc = mds_update_last_rcvd(mds, handle, req);
+
+ /* FIXME: need to return last_rcvd, last_committed */
+ /* FIXME: keep rc intact */
+ rc = mds_fs_commit(mds, de_tgt_dir->d_inode, handle);
EXIT;
out_link_dchild:
struct dentry *de_old = NULL;
struct dentry *de_new = NULL;
struct mds_obd *mds = &req->rq_obd->u.mds;
+ void *handle;
int rc = 0;
ENTRY;
OBD_FAIL_WRITE(OBD_FAIL_MDS_REINT_RENAME_WRITE,
de_srcdir->d_inode->i_sb->s_dev);
+ handle = mds_fs_start(mds, de_tgtdir->d_inode, MDS_FSOP_RENAME);
+ if (!handle)
+ GOTO(out_rename_denew, rc = PTR_ERR(handle));
rc = vfs_rename(de_srcdir->d_inode, de_old, de_tgtdir->d_inode, de_new);
+
+ if (!rc)
+ rc = mds_update_last_rcvd(mds, handle, req);
+
+ /* FIXME: need to return last_rcvd, last_committed */
+ /* FIXME: keep rc intact */
+ rc = mds_fs_commit(mds, de_tgtdir->d_inode, handle);
EXIT;
+out_rename_denew:
l_dput(de_new);
out_rename_deold:
l_dput(de_old);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff