WARNING: This commit breaks everything. It will be back in shape within 12

[fs/lustre-release.git] / lustre / mdc / mdc_reint.c

diff --git a/lustre/mdc/mdc_reint.c b/lustre/mdc/mdc_reint.c
index e2e062e..049c409 100644 (file)
--- a/lustre/mdc/mdc_reint.c
+++ b/lustre/mdc/mdc_reint.c
@@ -31,27 +31,30 @@
 #include <linux/obd_class.h>
 #include <linux/lustre_mds.h>
 
-static int mdc_reint(struct ptlrpc_client *cl, struct ptlrpc_request *request)
+static int mdc_reint(struct ptlrpc_client *cl, struct ptlrpc_request *request, int level)
 {
         int rc;
+        request->rq_level = level;
 
-        rc = ptlrpc_queue_wait(cl, request);
+        rc = ptlrpc_queue_wait(request);
         rc = ptlrpc_check_status(request, rc);
+
         if (rc)
                 CERROR("error in handling %d\n", rc);
 
         return rc;
 }
 
-int mdc_setattr(struct ptlrpc_client *cl, struct inode *inode,
-                struct iattr *iattr, struct ptlrpc_request **request)
+int mdc_setattr(struct ptlrpc_client *cl, struct ptlrpc_connection *conn,
+                struct inode *inode, struct iattr *iattr,
+                struct ptlrpc_request **request)
 {
         struct mds_rec_setattr *rec;
         struct ptlrpc_request *req;
         int rc, size = sizeof(*rec);
         ENTRY;
 
-        req = ptlrpc_prep_req(cl, MDS_REINT, 1, &size, NULL);
+        req = ptlrpc_prep_req(cl, conn, MDS_REINT, 1, &size, NULL);
         if (!req)
                 RETURN(-ENOMEM);
 
@@ -61,34 +64,50 @@ int mdc_setattr(struct ptlrpc_client *cl, struct inode *inode,
         size = sizeof(struct mds_body);
         req->rq_replen = lustre_msg_size(1, &size);
 
-        rc = mdc_reint(cl, req);
+        rc = mdc_reint(cl, req, LUSTRE_CONN_FULL);
         *request = req;
+        if (rc == -ERESTARTSYS )
+                rc = 0;
 
         RETURN(rc);
 }
 
-int mdc_create(struct ptlrpc_client *cl, struct inode *dir, const char *name,
-               int namelen, const char *tgt, int tgtlen, int mode, __u64 id,
-               __u32 uid, __u32 gid, __u64 time,
+int mdc_create(struct ptlrpc_client *cl, struct ptlrpc_connection *conn,
+               struct inode *dir, const char *name, int namelen,
+               const char *tgt, int tgtlen, int mode, __u32 uid,
+               __u32 gid, __u64 time, __u64 rdev, struct obdo *obdo,
                struct ptlrpc_request **request)
 {
         struct mds_rec_create *rec;
         struct ptlrpc_request *req;
-        int rc, size[3] = {sizeof(*rec), namelen + 1, tgtlen + 1};
-        char *tmp;
+        int rc, size[3] = {sizeof(*rec), namelen + 1, 0};
+        char *tmp, *bufs[3] = {NULL, NULL, NULL};
+        int level, bufcount = 2;
         ENTRY;
 
-        req = ptlrpc_prep_req(cl, MDS_REINT, 3, size, NULL);
+        if (S_ISREG(mode)) {
+                size[2] = sizeof(*obdo);
+                bufs[2] = (char *)obdo;
+                bufcount = 3;
+        } else if (S_ISLNK(mode)) {
+                size[2] = tgtlen + 1;
+                bufcount = 3;
+        }
+
+        req = ptlrpc_prep_req(cl, conn, MDS_REINT, bufcount, size, bufs);
         if (!req)
                 RETURN(-ENOMEM);
 
         rec = lustre_msg_buf(req->rq_reqmsg, 0);
-        mds_create_pack(rec, dir, mode, id, uid, gid, time);
+        mds_create_pack(rec, dir, mode, rdev, uid, gid, time);
 
         tmp = lustre_msg_buf(req->rq_reqmsg, 1);
         LOGL0(name, namelen, tmp);
 
-        if (tgt) {
+        if (S_ISREG(mode)) {
+                tmp = lustre_msg_buf(req->rq_reqmsg, 2);
+                memcpy(tmp, obdo, sizeof(*obdo));
+        } else if (S_ISLNK(mode)) {
                 tmp = lustre_msg_buf(req->rq_reqmsg, 2);
                 LOGL0(tgt, tgtlen, tmp);
         }
@@ -96,15 +115,26 @@ int mdc_create(struct ptlrpc_client *cl, struct inode *dir, const char *name,
         size[0] = sizeof(struct mds_body);
         req->rq_replen = lustre_msg_size(1, size);
 
-        rc = mdc_reint(cl, req);
-        *request = req;
+        level = LUSTRE_CONN_FULL;
+ resend:
+        rc = mdc_reint(cl, req, level);
+        if (rc == -ERESTARTSYS) {
+                struct mds_update_record_hdr *hdr =
+                        lustre_msg_buf(req->rq_reqmsg, 0);
+                level = LUSTRE_CONN_RECOVD;
+                CERROR("Lost reply: re-create rep.\n");
+                req->rq_flags = 0;
+                hdr->ur_opcode = NTOH__u32(REINT_RECREATE);
+                goto resend;
+        }
 
+        *request = req;
         RETURN(rc);
 }
 
-int mdc_unlink(struct ptlrpc_client *cl,  struct inode *dir,
-               struct inode *child, const char *name, int namelen,
-               struct ptlrpc_request **request)
+int mdc_unlink(struct ptlrpc_client *cl, struct ptlrpc_connection *conn,
+               struct inode *dir, struct inode *child, const char *name,
+               int namelen, struct ptlrpc_request **request)
 {
         struct mds_rec_unlink *rec;
         struct ptlrpc_request *req;
@@ -112,7 +142,7 @@ int mdc_unlink(struct ptlrpc_client *cl,  struct inode *dir,
         char *tmp;
         ENTRY;
 
-        req = ptlrpc_prep_req(cl, MDS_REINT, 2, size, NULL);
+        req = ptlrpc_prep_req(cl, conn, MDS_REINT, 2, size, NULL);
         if (!req)
                 RETURN(-ENOMEM);
 
@@ -125,14 +155,17 @@ int mdc_unlink(struct ptlrpc_client *cl,  struct inode *dir,
         size[0] = sizeof(struct mds_body);
         req->rq_replen = lustre_msg_size(1, size);
 
-        rc = mdc_reint(cl, req);
+        rc = mdc_reint(cl, req, LUSTRE_CONN_FULL);
         *request = req;
+        if (rc == -ERESTARTSYS )
+                rc = 0;
 
         RETURN(rc);
 }
 
-int mdc_link(struct ptlrpc_client *cl, struct dentry *src, struct inode *dir,
-             const char *name, int namelen, struct ptlrpc_request **request)
+int mdc_link(struct ptlrpc_client *cl, struct ptlrpc_connection *conn,
+             struct dentry *src, struct inode *dir, const char *name,
+             int namelen, struct ptlrpc_request **request)
 {
         struct mds_rec_link *rec;
         struct ptlrpc_request *req;
@@ -140,7 +173,7 @@ int mdc_link(struct ptlrpc_client *cl, struct dentry *src, struct inode *dir,
         char *tmp;
         ENTRY;
 
-        req = ptlrpc_prep_req(cl, MDS_REINT, 2, size, NULL);
+        req = ptlrpc_prep_req(cl, conn, MDS_REINT, 2, size, NULL);
         if (!req)
                 RETURN(-ENOMEM);
 
@@ -153,14 +186,17 @@ int mdc_link(struct ptlrpc_client *cl, struct dentry *src, struct inode *dir,
         size[0] = sizeof(struct mds_body);
         req->rq_replen = lustre_msg_size(1, size);
 
-        rc = mdc_reint(cl, req);
+        rc = mdc_reint(cl, req, LUSTRE_CONN_FULL);
         *request = req;
+        if (rc == -ERESTARTSYS )
+                rc = 0;
 
         RETURN(rc);
 }
 
-int mdc_rename(struct ptlrpc_client *cl, struct inode *src, struct inode *tgt,
-               const char *old, int oldlen, const char *new, int newlen,
+int mdc_rename(struct ptlrpc_client *cl, struct ptlrpc_connection *conn,
+               struct inode *src, struct inode *tgt, const char *old,
+               int oldlen, const char *new, int newlen,
                struct ptlrpc_request **request)
 {
         struct mds_rec_rename *rec;
@@ -169,7 +205,7 @@ int mdc_rename(struct ptlrpc_client *cl, struct inode *src, struct inode *tgt,
         char *tmp;
         ENTRY;
 
-        req = ptlrpc_prep_req(cl, MDS_REINT, 3, size, NULL);
+        req = ptlrpc_prep_req(cl, conn, MDS_REINT, 3, size, NULL);
         if (!req)
                 RETURN(-ENOMEM);
 
@@ -187,8 +223,10 @@ int mdc_rename(struct ptlrpc_client *cl, struct inode *src, struct inode *tgt,
         size[0] = sizeof(struct mds_body);
         req->rq_replen = lustre_msg_size(1, size);
 
-        rc = mdc_reint(cl, req);
+        rc = mdc_reint(cl, req, LUSTRE_CONN_FULL);
         *request = req;
+        if (rc == -ERESTARTSYS )
+                rc = 0;
 
         RETURN(rc);
 }