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

Commit fb91fb0e authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust
Browse files

NFS: Move call to nfs4_state_protect_write() to nfs4_write_setup() 



This doesn't really need to be in the generic NFS client code, and I
think it makes more sense to keep the v4 code in one place.

Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent e04bbf6b

fs/nfs/nfs3proc.c

+2 −1
Original line number Diff line number Diff line
@@ -823,7 +823,8 @@ static int nfs3_write_done(struct rpc_task *task, struct nfs_pgio_header *hdr) 
}



static void nfs3_proc_write_setup(struct nfs_pgio_header *hdr,

				  struct rpc_message *msg)

				  struct rpc_message *msg,

				  struct rpc_clnt **clnt)

{

	msg->rpc_proc = &nfs3_procedures[NFS3PROC_WRITE];

}

fs/nfs/nfs4proc.c

+3 −1
Original line number Diff line number Diff line
@@ -4979,7 +4979,8 @@ bool nfs4_write_need_cache_consistency_data(struct nfs_pgio_header *hdr) 
}



static void nfs4_proc_write_setup(struct nfs_pgio_header *hdr,

				  struct rpc_message *msg)

				  struct rpc_message *msg,

				  struct rpc_clnt **clnt)

{

	struct nfs_server *server = NFS_SERVER(hdr->inode);
@@ -4996,6 +4997,7 @@ static void nfs4_proc_write_setup(struct nfs_pgio_header *hdr, 


	msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_WRITE];

	nfs4_init_sequence(&hdr->args.seq_args, &hdr->res.seq_res, 1);

	nfs4_state_protect_write(server->nfs_client, clnt, msg, hdr);

}



static void nfs4_proc_commit_rpc_prepare(struct rpc_task *task, struct nfs_commit_data *data)

fs/nfs/proc.c

+2 −1
Original line number Diff line number Diff line
@@ -618,7 +618,8 @@ static int nfs_write_done(struct rpc_task *task, struct nfs_pgio_header *hdr) 
}



static void nfs_proc_write_setup(struct nfs_pgio_header *hdr,

				 struct rpc_message *msg)

				 struct rpc_message *msg,

				 struct rpc_clnt **clnt)

{

	/* Note: NFSv2 ignores @stable and always uses NFS_FILE_SYNC */

	hdr->args.stable = NFS_FILE_SYNC;

fs/nfs/write.c

+1 −4
Original line number Diff line number Diff line
@@ -1375,12 +1375,9 @@ static void nfs_initiate_write(struct nfs_pgio_header *hdr, 
	int priority = flush_task_priority(how);



	task_setup_data->priority = priority;

	rpc_ops->write_setup(hdr, msg);

	rpc_ops->write_setup(hdr, msg, &task_setup_data->rpc_client);

	trace_nfs_initiate_write(hdr->inode, hdr->io_start, hdr->good_bytes,

				 hdr->args.stable);



	nfs4_state_protect_write(NFS_SERVER(hdr->inode)->nfs_client,

				 &task_setup_data->rpc_client, msg, hdr);

}



/* If a nfs_flush_* function fails, it should remove reqs from @head and

include/linux/nfs_xdr.h

+2 −1
Original line number Diff line number Diff line
@@ -1620,7 +1620,8 @@ struct nfs_rpc_ops { 
				    struct nfs_pgio_header *);

	void	(*read_setup)(struct nfs_pgio_header *, struct rpc_message *);

	int	(*read_done)(struct rpc_task *, struct nfs_pgio_header *);

	void	(*write_setup)(struct nfs_pgio_header *, struct rpc_message *);

	void	(*write_setup)(struct nfs_pgio_header *, struct rpc_message *,

				struct rpc_clnt **);

	int	(*write_done)(struct rpc_task *, struct nfs_pgio_header *);

	void	(*commit_setup) (struct nfs_commit_data *, struct rpc_message *);

	void	(*commit_rpc_prepare)(struct rpc_task *, struct nfs_commit_data *);