Attachment #191541 for bug #226650

View | Details | Raw Unified | Return to bug 226650
Collapse All | Expand All

Lines 2951-2957 nfsrvd_open(struct nfsrv_descript *nd, _ Link Here

(-)fs/nfsserver/nfs_nfsdserv.c (-1 / +7 lines)
2951	*tl = txdr_unsigned(NFSV4OPEN_DELEGATEWRITE);	2961	*tl = txdr_unsigned(NFSV4OPEN_DELEGATEWRITE);
2952	else if (retext != 0) {	2962	else if (retext != 0) {
2953	*tl = txdr_unsigned(NFSV4OPEN_DELEGATENONEEXT);	2963	*tl = txdr_unsigned(NFSV4OPEN_DELEGATENONEEXT);
2954	if ((rflags & NFSV4OPEN_WDCONTENTION) != 0) {	2964	if ((rflags & NFSV4OPEN_WDNOTWANTED) != 0) {
		2965	NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED);
		2966	*tl = txdr_unsigned(NFSV4OPEN_NOTWANTED);
		2967	} else if ((rflags & NFSV4OPEN_WDSUPPFTYPE) != 0) {
		2968	NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED);
		2969	*tl = txdr_unsigned(NFSV4OPEN_NOTSUPPFTYPE);
		2970	} else if ((rflags & NFSV4OPEN_WDCONTENTION) != 0) {
2955	NFSM_BUILD(tl, u_int32_t , 2 NFSX_UNSIGNED);	2971	NFSM_BUILD(tl, u_int32_t , 2 NFSX_UNSIGNED);
2956	*tl++ = txdr_unsigned(NFSV4OPEN_CONTENTION);	2972	*tl++ = txdr_unsigned(NFSV4OPEN_CONTENTION);
2957	*tl = newnfs_false;	2973	*tl = newnfs_false;

Lines 3006-3012 tryagain: Link Here

(-)fs/nfsserver/nfs_nfsdstate.c (-13 / +15 lines)
3006	/*	3006	/*
3007	* This is where we can choose to issue a delegation.	3007	* This is where we can choose to issue a delegation.
3008	*/	3008	*/
3009	if (delegate == 0 \|\| writedeleg == 0 \|\|	3009	if ((new_stp->ls_flags & NFSLCK_WANTNODELEG) != 0)
		3010	*rflagsp \|= NFSV4OPEN_WDNOTWANTED;
		3011	else if (nfsrv_issuedelegs == 0)
		3012	*rflagsp \|= NFSV4OPEN_WDSUPPFTYPE;
		3013	else if (NFSRV_V4DELEGLIMIT(nfsrv_delegatecnt))
		3014	*rflagsp \|= NFSV4OPEN_WDRESOURCE;
		3015	else if (delegate == 0 \|\| writedeleg == 0 \|\|
3010	NFSVNO_EXRDONLY(exp) \|\| (readonly != 0 &&	3016	NFSVNO_EXRDONLY(exp) \|\| (readonly != 0 &&
3011	nfsrv_writedelegifpos == 0) \|\|	3017	nfsrv_writedelegifpos == 0) \|\|
3012	!NFSVNO_DELEGOK(vp) \|\|	3018	!NFSVNO_DELEGOK(vp) \|\|
Lines 3014-3024 tryagain: Link Here
3014	(clp->lc_flags & (LCL_CALLBACKSON \| LCL_CBDOWN)) !=	3020	(clp->lc_flags & (LCL_CALLBACKSON \| LCL_CBDOWN)) !=
3015	LCL_CALLBACKSON)	3021	LCL_CALLBACKSON)
3016	*rflagsp \|= NFSV4OPEN_WDCONTENTION;	3022	*rflagsp \|= NFSV4OPEN_WDCONTENTION;
3017	else if (nfsrv_issuedelegs == 0 \|\|
3018	NFSRV_V4DELEGLIMIT(nfsrv_delegatecnt))
3019	*rflagsp \|= NFSV4OPEN_WDRESOURCE;
3020	else if ((new_stp->ls_flags & NFSLCK_WANTNODELEG) != 0)
3021	*rflagsp \|= NFSV4OPEN_WDNOTWANTED;
3022	else {	3023	else {
3023	new_deleg->ls_stateid.seqid = delegstateidp->seqid = 1;	3024	new_deleg->ls_stateid.seqid = delegstateidp->seqid = 1;
3024	new_deleg->ls_stateid.other[0] = delegstateidp->other[0]	3025	new_deleg->ls_stateid.other[0] = delegstateidp->other[0]
Lines 3068-3083 tryagain: Link Here
3068	/*	3069	/*
3069	* This is where we can choose to issue a delegation.	3070	* This is where we can choose to issue a delegation.
3070	*/	3071	*/
3071	if (delegate == 0 \|\| (writedeleg == 0 && readonly == 0) \|\|	3072	if ((new_stp->ls_flags & NFSLCK_WANTNODELEG) != 0)
3072	!NFSVNO_DELEGOK(vp) \|\|	3073	*rflagsp \|= NFSV4OPEN_WDNOTWANTED;
		3074	else if (nfsrv_issuedelegs == 0)
		3075	*rflagsp \|= NFSV4OPEN_WDSUPPFTYPE;
		3076	else if (NFSRV_V4DELEGLIMIT(nfsrv_delegatecnt))
		3077	*rflagsp \|= NFSV4OPEN_WDRESOURCE;
		3078	else if (delegate == 0 \|\| (writedeleg == 0 &&
		3079	readonly == 0) \|\| !NFSVNO_DELEGOK(vp) \|\|
3073	(clp->lc_flags & (LCL_CALLBACKSON \| LCL_CBDOWN)) !=	3080	(clp->lc_flags & (LCL_CALLBACKSON \| LCL_CBDOWN)) !=
3074	LCL_CALLBACKSON)	3081	LCL_CALLBACKSON)
3075	*rflagsp \|= NFSV4OPEN_WDCONTENTION;	3082	*rflagsp \|= NFSV4OPEN_WDCONTENTION;
3076	else if (nfsrv_issuedelegs == 0 \|\|
3077	NFSRV_V4DELEGLIMIT(nfsrv_delegatecnt))
3078	*rflagsp \|= NFSV4OPEN_WDRESOURCE;
3079	else if ((new_stp->ls_flags & NFSLCK_WANTNODELEG) != 0)
3080	*rflagsp \|= NFSV4OPEN_WDNOTWANTED;
3081	else {	3083	else {
3082	new_deleg->ls_stateid.seqid = delegstateidp->seqid = 1;	3084	new_deleg->ls_stateid.seqid = delegstateidp->seqid = 1;
3083	new_deleg->ls_stateid.other[0] = delegstateidp->other[0]	3085	new_deleg->ls_stateid.other[0] = delegstateidp->other[0]

Lines 552-557 Link Here

(-)fs/nfs/nfsproto.h (+1 lines)
552	#define NFSV4OPEN_WDRESOURCE 0x00080000	552	#define NFSV4OPEN_WDRESOURCE 0x00080000
553	#define NFSV4OPEN_WDCONTENTION 0x00100000	553	#define NFSV4OPEN_WDCONTENTION 0x00100000
554	#define NFSV4OPEN_WDNOTWANTED 0x00200000	554	#define NFSV4OPEN_WDNOTWANTED 0x00200000
		555	#define NFSV4OPEN_WDSUPPFTYPE 0x00400000
555		556
556	/*	557	/*
557	* NFS V4 File Handle types	558	* NFS V4 File Handle types

Return to bug 226650