Skip to content

Commit af2427a

Browse files
committed
Merge: NFSv4: Don't check for OPEN feature support in v4.1
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6866 JIRA: https://issues.redhat.com/browse/RHEL-83435 Upstream Status: git://git.linux-nfs.org/projects/anna/linux-nfs.git fattr4_open_arguments is a v4.2 recommended attribute, so we shouldn't be sending it to v4.1 servers. Signed-off-by: Scott Mayhew <smayhew@redhat.com> Approved-by: Benjamin Coddington <bcodding@redhat.com> Approved-by: Olga Kornievskaia <okorniev@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Jan Stancek <jstancek@redhat.com>
2 parents 9114148 + a68186c commit af2427a

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

fs/nfs/nfs4proc.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3949,8 +3949,9 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *f
39493949
FATTR4_WORD0_CASE_INSENSITIVE |
39503950
FATTR4_WORD0_CASE_PRESERVING;
39513951
if (minorversion)
3952-
bitmask[2] = FATTR4_WORD2_SUPPATTR_EXCLCREAT |
3953-
FATTR4_WORD2_OPEN_ARGUMENTS;
3952+
bitmask[2] = FATTR4_WORD2_SUPPATTR_EXCLCREAT;
3953+
if (minorversion > 1)
3954+
bitmask[2] |= FATTR4_WORD2_OPEN_ARGUMENTS;
39543955

39553956
status = nfs4_call_sync(server->client, server, &msg, &args.seq_args, &res.seq_res, 0);
39563957
if (status == 0) {

0 commit comments

Comments
 (0)