Commit a033a091 authored by Andy Adamson's avatar Andy Adamson Committed by Trond Myklebust
Browse files

NFSv4.1 remove nfs4_reset_write and nfs4_reset_read 



Replaced by filelayout_reset_write and filelayout_reset_read

Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent e7dd79af

fs/nfs/internal.h

+0 −2
Original line number Diff line number Diff line
@@ -373,13 +373,11 @@ void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo, 


/* nfs4proc.c */

extern void __nfs4_read_done_cb(struct nfs_read_data *);

extern void nfs4_reset_read(struct rpc_task *task, struct nfs_read_data *data);

extern int nfs4_init_client(struct nfs_client *clp,

			    const struct rpc_timeout *timeparms,

			    const char *ip_addr,

			    rpc_authflavor_t authflavour,

			    int noresvport);

extern void nfs4_reset_write(struct rpc_task *task, struct nfs_write_data *data);

extern int _nfs4_call_sync(struct rpc_clnt *clnt,

			   struct nfs_server *server,

			   struct rpc_message *msg,

fs/nfs/nfs4proc.c

+0 −35
Original line number Diff line number Diff line
@@ -3369,23 +3369,6 @@ static void nfs4_proc_read_rpc_prepare(struct rpc_task *task, struct nfs_read_da 
	rpc_call_start(task);

}



/* Reset the the nfs_read_data to send the read to the MDS. */

void nfs4_reset_read(struct rpc_task *task, struct nfs_read_data *data)

{

	struct nfs_pgio_header *hdr = data->header;

	struct inode *inode = hdr->inode;



	dprintk("%s Reset task for i/o through\n", __func__);

	data->ds_clp = NULL;

	/* offsets will differ in the dense stripe case */

	data->args.offset = data->mds_offset;

	data->args.fh     = NFS_FH(inode);

	data->read_done_cb = nfs4_read_done_cb;

	task->tk_ops = hdr->mds_ops;

	rpc_task_reset_client(task, NFS_CLIENT(inode));

}

EXPORT_SYMBOL_GPL(nfs4_reset_read);



static int nfs4_write_done_cb(struct rpc_task *task, struct nfs_write_data *data)

{

	struct inode *inode = data->header->inode;
@@ -3409,24 +3392,6 @@ static int nfs4_write_done(struct rpc_task *task, struct nfs_write_data *data) 
		nfs4_write_done_cb(task, data);

}



/* Reset the the nfs_write_data to send the write to the MDS. */

void nfs4_reset_write(struct rpc_task *task, struct nfs_write_data *data)

{

	struct nfs_pgio_header *hdr = data->header;

	struct inode *inode = hdr->inode;



	dprintk("%s Reset task for i/o through\n", __func__);

	data->ds_clp     = NULL;

	data->write_done_cb = nfs4_write_done_cb;

	data->args.fh       = NFS_FH(inode);

	data->args.bitmask  = data->res.server->cache_consistency_bitmask;

	data->args.offset   = data->mds_offset;

	data->res.fattr     = &data->fattr;

	task->tk_ops        = hdr->mds_ops;

	rpc_task_reset_client(task, NFS_CLIENT(inode));

}

EXPORT_SYMBOL_GPL(nfs4_reset_write);



static

bool nfs4_write_need_cache_consistency_data(const struct nfs_write_data *data)

{