[PATCH] remove unused cl_flags field

The RPC clnt struct has a cl_flags field with one bit defined (in an NFS
header, no less).  no one ever sets the flag, so remove flag, field, and
test in NFSv2 XDR routines that check for the flag.

diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c
index 4673cca4d3b322517b80028106d19d458e030b65..ae7e115a9fa9a4c5bd75b0f8fdace0c4f8560f9b 100644 (file)
--- a/fs/nfs/nfs2xdr.c
+++ b/fs/nfs/nfs2xdr.c
@@ -355,13 +355,6 @@ nfs_xdr_readdirargs(struct rpc_rqst *req, u32 *p, struct nfs_readdirargs *args)
        unsigned int replen;
        u32 count = args->count;
 
-       /*
-        * Some servers (e.g. HP OS 9.5) seem to expect the buffer size
-        * to be in longwords ... check whether to convert the size.
-        */
-       if (task->tk_client->cl_flags & NFS_CLNTF_BUFSIZE)
-               count = count >> 2;
-
        p = xdr_encode_fhandle(p, args->fh);
        *p++ = htonl(args->cookie);
        *p++ = htonl(count); /* see above */

diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index d5194a339d18f782b3f1363961dcd19b7229a359..6bc15fe5798c9660b5d0b6cd3e52edb6b102170c 100644 (file)
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -75,9 +75,6 @@
  */
 #define NFS_RPC_SWAPFLAGS              (RPC_TASK_SWAPPER|RPC_TASK_ROOTCREDS)
 
-/* Flags in the RPC client structure */
-#define NFS_CLNTF_BUFSIZE      0x0001  /* readdir buffer in longwords */
-
 #define NFS_RW_SYNC            0x0001  /* O_SYNC handling */
 #define NFS_RW_SWAP            0x0002  /* This is a swap request */
 

diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index cdf7cd60e358982705e67dba6e10e3bbe79526a4..1d9d01cf7494f4f227114013c6ef1ea481c3d116 100644 (file)
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -50,7 +50,6 @@ struct rpc_clnt {
                                cl_droppriv : 1,/* enable NFS suid hack */
                                cl_oneshot  : 1,/* dispose after use */
                                cl_dead     : 1;/* abandoned */
-       unsigned int            cl_flags;       /* misc client flags */
        unsigned long           cl_hardmax;     /* max hard timeout */
 
        struct rpc_rtt          cl_rtt;         /* RTO estimator data */