NFSv4: Prime SETCLIENTID call for the delegation callback info.

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 941347732930f2039dfaca131de6b78b677f727b..257f3c6597d185e7d73c974000994fee1a9ac299 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -1996,13 +1996,15 @@ nfs4_request_compatible(struct nfs_page *req, struct file *filp, struct page *pa
        return 1;
 }
 
-int
-nfs4_proc_setclientid(struct nfs4_client *clp,
-               u32 program, unsigned short port)
+int nfs4_proc_setclientid(struct nfs4_client *clp, u32 program, unsigned short port)
 {
-       u32 *p;
-       struct nfs4_setclientid setclientid;
-       struct timespec tv;
+       static nfs4_verifier sc_verifier;
+       static int initialized;
+       
+       struct nfs4_setclientid setclientid = {
+               .sc_verifier = &sc_verifier,
+               .sc_prog = program,
+       };
        struct rpc_message msg = {
                .rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_SETCLIENTID],
                .rpc_argp = &setclientid,
@@ -2010,15 +2012,24 @@ nfs4_proc_setclientid(struct nfs4_client *clp,
                .rpc_cred = clp->cl_cred,
        };
 
-       tv = CURRENT_TIME;
-       p = (u32*)setclientid.sc_verifier.data;
-       *p++ = (u32)tv.tv_sec;
-       *p = (u32)tv.tv_nsec;
-       setclientid.sc_name = clp->cl_ipaddr;
-       sprintf(setclientid.sc_netid, "tcp");
-       sprintf(setclientid.sc_uaddr, "%s.%d.%d", clp->cl_ipaddr, port >> 8, port & 255);
-       setclientid.sc_prog = htonl(program);
-       setclientid.sc_cb_ident = 0;
+       if (!initialized) {
+               struct timespec boot_time;
+               u32 *p;
+
+               initialized = 1;
+               boot_time = CURRENT_TIME;
+               p = (u32*)sc_verifier.data;
+               *p++ = htonl((u32)boot_time.tv_sec);
+               *p = htonl((u32)boot_time.tv_nsec);
+       }
+       setclientid.sc_name_len = scnprintf(setclientid.sc_name,
+                       sizeof(setclientid.sc_name), "%s/%u.%u.%u.%u",
+                       clp->cl_ipaddr, NIPQUAD(clp->cl_addr.s_addr));
+       setclientid.sc_netid_len = scnprintf(setclientid.sc_netid,
+                       sizeof(setclientid.sc_netid), "tcp");
+       setclientid.sc_uaddr_len = scnprintf(setclientid.sc_uaddr,
+                       sizeof(setclientid.sc_uaddr), "%s.%d.%d",
+                       clp->cl_ipaddr, port >> 8, port & 255);
 
        return rpc_call_sync(clp->cl_rpcclient, &msg, 0);
 }

diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index a8d4e4c5224e4a9a03f5d0bee44f9fb673857e72..4988e501603a022068a087a8386ce6d72d0adc9a 100644 (file)
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -404,6 +404,15 @@ struct compound_hdr {
        BUG_ON(!p);                                             \
 } while (0)
 
+static void encode_string(struct xdr_stream *xdr, unsigned int len, const char *str)
+{
+       uint32_t *p;
+
+       p = xdr_reserve_space(xdr, 4 + len);
+       BUG_ON(p == NULL);
+       xdr_encode_opaque(p, str, len);
+}
+
 static int encode_compound_hdr(struct xdr_stream *xdr, struct compound_hdr *hdr)
 {
        uint32_t *p;
@@ -1047,26 +1056,18 @@ static int encode_setattr(struct xdr_stream *xdr, const struct nfs_setattrargs *
 
 static int encode_setclientid(struct xdr_stream *xdr, const struct nfs4_setclientid *setclientid)
 {
-       uint32_t total_len;
-       uint32_t len1, len2, len3;
        uint32_t *p;
 
-       len1 = strlen(setclientid->sc_name);
-       len2 = strlen(setclientid->sc_netid);
-       len3 = strlen(setclientid->sc_uaddr);
-       total_len = XDR_QUADLEN(len1) + XDR_QUADLEN(len2) + XDR_QUADLEN(len3);
-       total_len = (total_len << 2) + 24 + sizeof(setclientid->sc_verifier.data);
-
-       RESERVE_SPACE(total_len);
+       RESERVE_SPACE(4 + sizeof(setclientid->sc_verifier->data));
        WRITE32(OP_SETCLIENTID);
-       WRITEMEM(setclientid->sc_verifier.data, sizeof(setclientid->sc_verifier.data));
-       WRITE32(len1);
-       WRITEMEM(setclientid->sc_name, len1);
+       WRITEMEM(setclientid->sc_verifier->data, sizeof(setclientid->sc_verifier->data));
+
+       encode_string(xdr, setclientid->sc_name_len, setclientid->sc_name);
+       RESERVE_SPACE(4);
        WRITE32(setclientid->sc_prog);
-       WRITE32(len2);
-       WRITEMEM(setclientid->sc_netid, len2);
-       WRITE32(len3);
-       WRITEMEM(setclientid->sc_uaddr, len3);
+       encode_string(xdr, setclientid->sc_netid_len, setclientid->sc_netid);
+       encode_string(xdr, setclientid->sc_uaddr_len, setclientid->sc_uaddr);
+       RESERVE_SPACE(4);
        WRITE32(setclientid->sc_cb_ident);
 
        return 0;

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 2c7f4617e650e3740a82b9731a15ab589681560d..427ec6708d20dead6f47d8b6962edfd79868d91f 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -597,13 +597,15 @@ struct nfs4_rename_res {
 };
 
 struct nfs4_setclientid {
-       nfs4_verifier                   sc_verifier;      /* request */
-       char *                          sc_name;          /* request */
+       const nfs4_verifier *           sc_verifier;      /* request */
+       unsigned int                    sc_name_len;
+       char                            sc_name[32];      /* request */
        u32                             sc_prog;          /* request */
+       unsigned int                    sc_netid_len;
        char                            sc_netid[4];      /* request */
+       unsigned int                    sc_uaddr_len;
        char                            sc_uaddr[24];     /* request */
        u32                             sc_cb_ident;      /* request */
-       struct nfs4_client *            sc_state;         /* response */
 };
 
 struct nfs4_statfs_arg {