]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
NFSv4: Don't check for OPEN feature support in v4.1
authorScott Mayhew <smayhew@redhat.com>
Wed, 30 Apr 2025 11:12:29 +0000 (07:12 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2025 10:11:15 +0000 (11:11 +0100)
commit 4d4832ed13ff505fe0371544b4773e79be2bb964 upstream.

fattr4_open_arguments is a v4.2 recommended attribute, so we shouldn't
be sending it to v4.1 servers.

Fixes: cb78f9b7d0c0 ("nfs: fix the fetch of FATTR4_OPEN_ARGUMENTS")
Signed-off-by: Scott Mayhew <smayhew@redhat.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Benjamin Coddington <bcodding@redhat.com>
Cc: stable@vger.kernel.org # 6.11+
Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/nfs/nfs4proc.c

index 11f2b5cb3b06b2cc03be64b7bdcfd09da8cb93eb..57d49e874f51faebcbdb22fcfa2100f6838461d7 100644 (file)
@@ -3957,8 +3957,9 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *f
                     FATTR4_WORD0_CASE_INSENSITIVE |
                     FATTR4_WORD0_CASE_PRESERVING;
        if (minorversion)
-               bitmask[2] = FATTR4_WORD2_SUPPATTR_EXCLCREAT |
-                            FATTR4_WORD2_OPEN_ARGUMENTS;
+               bitmask[2] = FATTR4_WORD2_SUPPATTR_EXCLCREAT;
+       if (minorversion > 1)
+               bitmask[2] |= FATTR4_WORD2_OPEN_ARGUMENTS;
 
        status = nfs4_call_sync(server->client, server, &msg, &args.seq_args, &res.seq_res, 0);
        if (status == 0) {