Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbc9c36c authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: more sessions/open-owner-replay cleanup 



More logic that's unnecessary in the 4.1 case.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 3d74e6a5

fs/nfsd/nfs4proc.c

+16 −12
Original line number Diff line number Diff line
@@ -191,9 +191,18 @@ static __be32 nfsd_check_obj_isreg(struct svc_fh *fh) 
	return nfserr_symlink;

}



static void nfsd4_set_open_owner_reply_cache(struct nfsd4_compound_state *cstate, struct nfsd4_open *open, struct svc_fh *resfh)

{

	if (nfsd4_has_session(cstate))

		return;

	fh_copy_shallow(&open->op_openowner->oo_owner.so_replay.rp_openfh,

			&resfh->fh_handle);

}



static __be32

do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open)

do_open_lookup(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfsd4_open *open)

{

	struct svc_fh *current_fh = &cstate->current_fh;

	struct svc_fh *resfh;

	int accmode;

	__be32 status;
@@ -252,9 +261,7 @@ do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_o 
	if (is_create_with_attrs(open) && open->op_acl != NULL)

		do_set_nfs4_acl(rqstp, resfh, open->op_acl, open->op_bmval);



	/* set reply cache */

	fh_copy_shallow(&open->op_openowner->oo_owner.so_replay.rp_openfh,

			&resfh->fh_handle);

	nfsd4_set_open_owner_reply_cache(cstate, open, resfh);

	accmode = NFSD_MAY_NOP;

	if (open->op_created)

		accmode |= NFSD_MAY_OWNER_OVERRIDE;
@@ -268,8 +275,9 @@ do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_o 
}



static __be32

do_open_fhandle(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open)

do_open_fhandle(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfsd4_open *open)

{

	struct svc_fh *current_fh = &cstate->current_fh;

	__be32 status;



	/* We don't know the target directory, and therefore can not
@@ -278,9 +286,7 @@ do_open_fhandle(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_ 


	memset(&open->op_cinfo, 0, sizeof(struct nfsd4_change_info));



	/* set replay cache */

	fh_copy_shallow(&open->op_openowner->oo_owner.so_replay.rp_openfh,

			&current_fh->fh_handle);

	nfsd4_set_open_owner_reply_cache(cstate, open, current_fh);



	open->op_truncate = (open->op_iattr.ia_valid & ATTR_SIZE) &&

		(open->op_iattr.ia_size == 0);
@@ -372,8 +378,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	switch (open->op_claim_type) {

		case NFS4_OPEN_CLAIM_DELEGATE_CUR:

		case NFS4_OPEN_CLAIM_NULL:

			status = do_open_lookup(rqstp, &cstate->current_fh,

						open);

			status = do_open_lookup(rqstp, cstate, open);

			if (status)

				goto out;

			break;
@@ -386,8 +391,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
				goto out;

		case NFS4_OPEN_CLAIM_FH:

		case NFS4_OPEN_CLAIM_DELEG_CUR_FH:

			status = do_open_fhandle(rqstp, &cstate->current_fh,

						 open);

			status = do_open_fhandle(rqstp, cstate, open);

			if (status)

				goto out;

			break;