#include <linux/lustre_mds.h>
#include <linux/obd_class.h>
-int mds_update_last_rcvd(struct mds_obd *mds, struct ptlrpc_request *req)
+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 mds client info found for UUID '%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_data, *mci = &mci_data;
- struct mds_client_data mcd_data, *mcd = &mcd_data;
+ struct mds_client_info *mci;
loff_t off;
int rc;
- /* Just a placeholder until more gets committed */
- memset(mcd, 0, sizeof(*mcd));
- mci->mci_mcd = mcd;
- mci->mci_off = off = MDS_LR_CLIENT;
+ 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? */
+ req->rq_repmsg->transno = HTON__u64(mds->mds_last_rcvd);
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 %Ld: rc = %d\n",
+ 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
rc = mds_fs_setattr(mds, de, handle, &rec->ur_iattr);
if (!rc)
- rc = mds_update_last_rcvd(mds, req);
+ rc = mds_update_last_rcvd(mds, handle, req);
+ /* FIXME: need to return last_rcvd, last_committed */
EXIT;
return(0);
}
+static int mds_reint_recreate(struct mds_update_record *rec,
+ struct ptlrpc_request *req)
+{
+ struct dentry *de = NULL;
+ struct mds_obd *mds = &req->rq_obd->u.mds;
+ struct dentry *dchild = NULL;
+ struct inode *dir;
+ int rc = 0;
+ ENTRY;
+
+ de = mds_fid2dentry(mds, rec->ur_fid1, NULL);
+ if (IS_ERR(de) || OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_CREATE)) {
+ LBUG();
+ GOTO(out_create_de, rc = -ESTALE);
+ }
+ dir = de->d_inode;
+ 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 (IS_ERR(dchild)) {
+ CERROR("child lookup error %ld\n", PTR_ERR(dchild));
+ up(&dir->i_sem);
+ LBUG();
+ GOTO(out_create_dchild, rc = -ESTALE);
+ }
+
+ if (dchild->d_inode) {
+ struct mds_body *body;
+ rc = 0;
+ body = lustre_msg_buf(req->rq_repmsg, 0);
+ body->ino = dchild->d_inode->i_ino;
+ body->generation = dchild->d_inode->i_generation;
+ } else {
+ CERROR("child doesn't exist (dir %ld, name %s)\n",
+ dir->i_ino, rec->ur_name);
+ rc = -ENOENT;
+ LBUG();
+ }
+
+out_create_dchild:
+ l_dput(dchild);
+ up(&dir->i_sem);
+out_create_de:
+ l_dput(de);
+ req->rq_status = rc;
+ return 0;
+}
static int mds_reint_create(struct mds_update_record *rec,
struct ptlrpc_request *req)
{
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 name %s mode %o\n",
+ dir->i_ino, rec->ur_name, rec->ur_mode);
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;
}
- if (!rc)
- rc = mds_update_last_rcvd(mds, req);
-
out_create_commit:
/* FIXME: keep rc intact */
rc = mds_fs_commit(mds, dir, handle);
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);
}
if (!rc)
- rc = mds_update_last_rcvd(mds, req);
+ 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);
rc = vfs_link(de_src, de_tgt_dir->d_inode, dchild);
if (!rc)
- rc = mds_update_last_rcvd(mds, req);
+ 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;
rc = vfs_rename(de_srcdir->d_inode, de_old, de_tgtdir->d_inode, de_new);
if (!rc)
- rc = mds_update_last_rcvd(mds, req);
+ 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;
[REINT_UNLINK] mds_reint_unlink,
[REINT_LINK] mds_reint_link,
[REINT_RENAME] mds_reint_rename,
+ [REINT_RECREATE] mds_reint_recreate,
};
int mds_reint_rec(struct mds_update_record *rec, struct ptlrpc_request *req)
}
rc = reinters[rec->ur_opcode](rec, req);
+
return rc;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff