Commit c9c99a33 authored by Jeff Layton's avatar Jeff Layton Committed by Chuck Lever
Browse files

nfsd: rename NFS4_SHARE_WANT_* constants to OPEN4_SHARE_ACCESS_WANT_* 



Add the OPEN4_SHARE_ACCESS_WANT constants from the nfs4.1 and delstid
draft into the nfs4_1.x file, and regenerate the headers and source
files. Do a mass renaming of NFS4_SHARE_WANT_* to
OPEN4_SHARE_ACCESS_WANT_* in the nfsd directory.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 8dfbea8b

Documentation/sunrpc/xdr/nfs4_1.x

+14 −1
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ pragma public fattr4_open_arguments; 
const FATTR4_OPEN_ARGUMENTS     = 86;





const OPEN4_SHARE_ACCESS_WANT_OPEN_XOR_DELEGATION = 0x200000;





const OPEN4_RESULT_NO_OPEN_STATEID = 0x00000010;
@@ -161,7 +160,21 @@ pragma public fattr4_time_deleg_modify; 
const FATTR4_TIME_DELEG_ACCESS  = 84;

const FATTR4_TIME_DELEG_MODIFY  = 85;







/* new flags for share_access field of OPEN4args */

const OPEN4_SHARE_ACCESS_WANT_DELEG_MASK        = 0xFF00;

const OPEN4_SHARE_ACCESS_WANT_NO_PREFERENCE     = 0x0000;

const OPEN4_SHARE_ACCESS_WANT_READ_DELEG        = 0x0100;

const OPEN4_SHARE_ACCESS_WANT_WRITE_DELEG       = 0x0200;

const OPEN4_SHARE_ACCESS_WANT_ANY_DELEG         = 0x0300;

const OPEN4_SHARE_ACCESS_WANT_NO_DELEG          = 0x0400;

const OPEN4_SHARE_ACCESS_WANT_CANCEL            = 0x0500;



const OPEN4_SHARE_ACCESS_WANT_SIGNAL_DELEG_WHEN_RESRC_AVAIL = 0x10000;

const OPEN4_SHARE_ACCESS_WANT_PUSH_DELEG_WHEN_UNCONTENDED = 0x20000;

const OPEN4_SHARE_ACCESS_WANT_DELEG_TIMESTAMPS = 0x100000;

const OPEN4_SHARE_ACCESS_WANT_OPEN_XOR_DELEGATION = 0x200000;



enum open_delegation_type4 {

       OPEN_DELEGATE_NONE                  = 0,

fs/nfsd/nfs4state.c

+8 −8
Original line number Diff line number Diff line
@@ -6073,14 +6073,14 @@ static void nfsd4_open_deleg_none_ext(struct nfsd4_open *open, int status) 
	else {

		open->op_why_no_deleg = WND4_RESOURCE;

		switch (open->op_deleg_want) {

		case NFS4_SHARE_WANT_READ_DELEG:

		case NFS4_SHARE_WANT_WRITE_DELEG:

		case NFS4_SHARE_WANT_ANY_DELEG:

		case OPEN4_SHARE_ACCESS_WANT_READ_DELEG:

		case OPEN4_SHARE_ACCESS_WANT_WRITE_DELEG:

		case OPEN4_SHARE_ACCESS_WANT_ANY_DELEG:

			break;

		case NFS4_SHARE_WANT_CANCEL:

		case OPEN4_SHARE_ACCESS_WANT_CANCEL:

			open->op_why_no_deleg = WND4_CANCELLED;

			break;

		case NFS4_SHARE_WANT_NO_DELEG:

		case OPEN4_SHARE_ACCESS_WANT_NO_DELEG:

			WARN_ON_ONCE(1);

		}

	}
@@ -6210,11 +6210,11 @@ nfs4_open_delegation(struct nfsd4_open *open, struct nfs4_ol_stateid *stp, 
static void nfsd4_deleg_xgrade_none_ext(struct nfsd4_open *open,

					struct nfs4_delegation *dp)

{

	if (open->op_deleg_want == NFS4_SHARE_WANT_READ_DELEG &&

	if (open->op_deleg_want == OPEN4_SHARE_ACCESS_WANT_READ_DELEG &&

	    dp->dl_type == OPEN_DELEGATE_WRITE) {

		open->op_delegate_type = OPEN_DELEGATE_NONE_EXT;

		open->op_why_no_deleg = WND4_NOT_SUPP_DOWNGRADE;

	} else if (open->op_deleg_want == NFS4_SHARE_WANT_WRITE_DELEG &&

	} else if (open->op_deleg_want == OPEN4_SHARE_ACCESS_WANT_WRITE_DELEG &&

		   dp->dl_type == OPEN_DELEGATE_WRITE) {

		open->op_delegate_type = OPEN_DELEGATE_NONE_EXT;

		open->op_why_no_deleg = WND4_NOT_SUPP_UPGRADE;
@@ -6310,7 +6310,7 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf 
	mutex_unlock(&stp->st_mutex);



	if (nfsd4_has_session(&resp->cstate)) {

		if (open->op_deleg_want & NFS4_SHARE_WANT_NO_DELEG) {

		if (open->op_deleg_want & OPEN4_SHARE_ACCESS_WANT_NO_DELEG) {

			open->op_delegate_type = OPEN_DELEGATE_NONE_EXT;

			open->op_why_no_deleg = WND4_NOT_WANTED;

			goto nodeleg;

fs/nfsd/nfs4xdr.c

+6 −6
Original line number Diff line number Diff line
@@ -1067,12 +1067,12 @@ static __be32 nfsd4_decode_share_access(struct nfsd4_compoundargs *argp, u32 *sh 
	if (!argp->minorversion)

		return nfserr_bad_xdr;

	switch (w & NFS4_SHARE_WANT_MASK) {

	case NFS4_SHARE_WANT_NO_PREFERENCE:

	case NFS4_SHARE_WANT_READ_DELEG:

	case NFS4_SHARE_WANT_WRITE_DELEG:

	case NFS4_SHARE_WANT_ANY_DELEG:

	case NFS4_SHARE_WANT_NO_DELEG:

	case NFS4_SHARE_WANT_CANCEL:

	case OPEN4_SHARE_ACCESS_WANT_NO_PREFERENCE:

	case OPEN4_SHARE_ACCESS_WANT_READ_DELEG:

	case OPEN4_SHARE_ACCESS_WANT_WRITE_DELEG:

	case OPEN4_SHARE_ACCESS_WANT_ANY_DELEG:

	case OPEN4_SHARE_ACCESS_WANT_NO_DELEG:

	case OPEN4_SHARE_ACCESS_WANT_CANCEL:

		break;

	default:

		return nfserr_bad_xdr;

fs/nfsd/nfs4xdr_gen.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// Generated by xdrgen. Manual edits will be lost.

// XDR specification file: ../../Documentation/sunrpc/xdr/nfs4_1.x

// XDR specification modification time: Sat Oct 12 08:10:54 2024

// XDR specification modification time: Mon Oct 14 09:10:13 2024



#include <linux/sunrpc/svc.h>

fs/nfsd/nfs4xdr_gen.h

+1 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Generated by xdrgen. Manual edits will be lost. */

/* XDR specification file: ../../Documentation/sunrpc/xdr/nfs4_1.x */

/* XDR specification modification time: Sat Oct 12 08:10:54 2024 */

/* XDR specification modification time: Mon Oct 14 09:10:13 2024 */



#ifndef _LINUX_XDRGEN_NFS4_1_DECL_H

#define _LINUX_XDRGEN_NFS4_1_DECL_H