nfsd4: discard some unused nfsd4_verify xdr code
authorJ. Bruce Fields <bfields@redhat.com>
Fri, 30 Nov 2012 22:24:18 +0000 (17:24 -0500)
committerJ. Bruce Fields <bfields@redhat.com>
Mon, 3 Dec 2012 14:43:51 +0000 (09:43 -0500)
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/nfs4xdr.c

index b775366a0a68ff166c25791080a3477c26a8a408..3bf8a9d7f2171e67c0ebf8507deb60ab3cb1187b 100644 (file)
@@ -1106,31 +1106,14 @@ nfsd4_decode_setclientid_confirm(struct nfsd4_compoundargs *argp, struct nfsd4_s
 static __be32
 nfsd4_decode_verify(struct nfsd4_compoundargs *argp, struct nfsd4_verify *verify)
 {
-#if 0
-       struct nfsd4_compoundargs save = {
-               .p = argp->p,
-               .end = argp->end,
-               .rqstp = argp->rqstp,
-       };
-       u32             ve_bmval[2];
-       struct iattr    ve_iattr;           /* request */
-       struct nfs4_acl *ve_acl;            /* request */
-#endif
        DECODE_HEAD;
 
        if ((status = nfsd4_decode_bitmap(argp, verify->ve_bmval)))
                goto out;
 
        /* For convenience's sake, we compare raw xdr'd attributes in
-        * nfsd4_proc_verify; however we still decode here just to return
-        * correct error in case of bad xdr. */
-#if 0
-       status = nfsd4_decode_fattr(ve_bmval, &ve_iattr, &ve_acl);
-       if (status == nfserr_inval) {
-               status = nfserrno(status);
-               goto out;
-       }
-#endif
+        * nfsd4_proc_verify */
+
        READ_BUF(4);
        READ32(verify->ve_attrlen);
        READ_BUF(verify->ve_attrlen);