Trond Myklebust <Trond.Myklebust@xxxxxxxxxx> wrote:
> This is really ugly and unnecessary. Please just remove those ifdefs,
> and have clp->cl_minorversion data->minorversion always defined, and set
> to 0.
squash intto "nfs41: Use mount minorversion option"
Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxxx>
---
fs/nfs/client.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index bce02da..870742e 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -102,9 +102,7 @@ struct nfs_client_initdata {
size_t addrlen;
const struct nfs_rpc_ops *rpc_ops;
int proto;
-#ifdef CONFIG_NFS_V4
u32 minorversion;
-#endif
};
/*
@@ -451,11 +449,9 @@ static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *dat
if (clp->cl_proto != data->proto)
continue;
-#ifdef CONFIG_NFS_V4
- /* Match minorversion */
+ /* Match nfsv4 minorversion */
if (clp->cl_minorversion != data->minorversion)
continue;
-#endif
/* Match the full socket address */
if (!nfs_sockaddr_cmp(sap, clap))
continue;
--
1.6.2.1
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
