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

Commit aa0d6aed authored by Anna Schumaker's avatar Anna Schumaker Committed by Al Viro
Browse files

nfsd: Pass filehandle to nfs4_preprocess_stateid_op() 



This will be needed so COPY can look up the saved_fh in addition to the
current_fh.

Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarJ. Bruce Fields <bfields@fieldses.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 04b38d60

fs/nfsd/nfs4proc.c

+9 −7
Original line number Diff line number Diff line
@@ -774,8 +774,9 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
		clear_bit(RQ_SPLICE_OK, &rqstp->rq_flags);



	/* check stateid */

	status = nfs4_preprocess_stateid_op(rqstp, cstate, &read->rd_stateid,

			RD_STATE, &read->rd_filp, &read->rd_tmp_file);

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

					&read->rd_stateid, RD_STATE,

					&read->rd_filp, &read->rd_tmp_file);

	if (status) {

		dprintk("NFSD: nfsd4_read: couldn't process stateid!\n");

		goto out;
@@ -921,7 +922,8 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 


	if (setattr->sa_iattr.ia_valid & ATTR_SIZE) {

		status = nfs4_preprocess_stateid_op(rqstp, cstate,

			&setattr->sa_stateid, WR_STATE, NULL, NULL);

				&cstate->current_fh, &setattr->sa_stateid,

				WR_STATE, NULL, NULL);

		if (status) {

			dprintk("NFSD: nfsd4_setattr: couldn't process stateid!\n");

			return status;
@@ -985,8 +987,8 @@ nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	if (write->wr_offset >= OFFSET_MAX)

		return nfserr_inval;



	status = nfs4_preprocess_stateid_op(rqstp, cstate, stateid, WR_STATE,

			&filp, NULL);

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

						stateid, WR_STATE, &filp, NULL);

	if (status) {

		dprintk("NFSD: nfsd4_write: couldn't process stateid!\n");

		return status;
@@ -1016,7 +1018,7 @@ nfsd4_fallocate(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	__be32 status = nfserr_notsupp;

	struct file *file;



	status = nfs4_preprocess_stateid_op(rqstp, cstate,

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

					    &fallocate->falloc_stateid,

					    WR_STATE, &file, NULL);

	if (status != nfs_ok) {
@@ -1055,7 +1057,7 @@ nfsd4_seek(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	__be32 status;

	struct file *file;



	status = nfs4_preprocess_stateid_op(rqstp, cstate,

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

					    &seek->seek_stateid,

					    RD_STATE, &file, NULL);

	if (status) {

fs/nfsd/nfs4state.c

+2 −3
Original line number Diff line number Diff line
@@ -4797,10 +4797,9 @@ nfs4_check_file(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfs4_stid *s, 
 */

__be32

nfs4_preprocess_stateid_op(struct svc_rqst *rqstp,

		struct nfsd4_compound_state *cstate, stateid_t *stateid,

		int flags, struct file **filpp, bool *tmp_file)

		struct nfsd4_compound_state *cstate, struct svc_fh *fhp,

		stateid_t *stateid, int flags, struct file **filpp, bool *tmp_file)

{

	struct svc_fh *fhp = &cstate->current_fh;

	struct inode *ino = d_inode(fhp->fh_dentry);

	struct net *net = SVC_NET(rqstp);

	struct nfsd_net *nn = net_generic(net, nfsd_net_id);

fs/nfsd/state.h

+2 −2
Original line number Diff line number Diff line
@@ -578,8 +578,8 @@ struct nfsd4_compound_state; 
struct nfsd_net;



extern __be32 nfs4_preprocess_stateid_op(struct svc_rqst *rqstp,

		struct nfsd4_compound_state *cstate, stateid_t *stateid,

		int flags, struct file **filp, bool *tmp_file);

		struct nfsd4_compound_state *cstate, struct svc_fh *fhp,

		stateid_t *stateid, int flags, struct file **filp, bool *tmp_file);

__be32 nfsd4_lookup_stateid(struct nfsd4_compound_state *cstate,

		     stateid_t *stateid, unsigned char typemask,

		     struct nfs4_stid **s, struct nfsd_net *nn);