From e48c81bbc188964ac3932539e53287491f2c1d87 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Fri, 5 Nov 2021 13:40:11 -0400 Subject: NFSv4: Remove unnecessary 'minor version' check It is completely redundant to the server capability check. Signed-off-by: Trond Myklebust --- fs/nfs/inode.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'fs') diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index b81b2d2f47ad..b4cb75c45f90 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -378,14 +378,10 @@ void nfs_setsecurity(struct inode *inode, struct nfs_fattr *fattr, struct nfs4_label *nfs4_label_alloc(struct nfs_server *server, gfp_t flags) { - struct nfs4_label *label = NULL; - int minor_version = server->nfs_client->cl_minorversion; - - if (minor_version < 2) - return label; + struct nfs4_label *label; if (!(server->caps & NFS_CAP_SECURITY_LABEL)) - return label; + return NULL; label = kzalloc(sizeof(struct nfs4_label), flags); if (label == NULL) -- cgit v1.2.3