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

Commit abde71f4 authored by Tom Haynes's avatar Tom Haynes
Browse files

pnfs: Add nfs_rpc_ops in calls to nfs_initiate_pgio 



Signed-off-by: default avatarTom Haynes <loghyr@primarydata.com>
parent 5f01d953

fs/nfs/filelayout/filelayout.c

+2 −2
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ filelayout_read_pagelist(struct nfs_pgio_header *hdr) 
	hdr->mds_offset = offset;



	/* Perform an asynchronous read to ds */

	nfs_initiate_pgio(ds_clnt, hdr,

	nfs_initiate_pgio(ds_clnt, hdr, NFS_PROTO(hdr->inode),

			    &filelayout_read_call_ops, 0, RPC_TASK_SOFTCONN);

	return PNFS_ATTEMPTED;

}
@@ -542,7 +542,7 @@ filelayout_write_pagelist(struct nfs_pgio_header *hdr, int sync) 
	hdr->args.offset = filelayout_get_dserver_offset(lseg, offset);



	/* Perform an asynchronous write */

	nfs_initiate_pgio(ds_clnt, hdr,

	nfs_initiate_pgio(ds_clnt, hdr, NFS_PROTO(hdr->inode),

				    &filelayout_write_call_ops, sync,

				    RPC_TASK_SOFTCONN);

	return PNFS_ATTEMPTED;

fs/nfs/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ void nfs_pgio_header_free(struct nfs_pgio_header *); 
void nfs_pgio_data_destroy(struct nfs_pgio_header *);

int nfs_generic_pgio(struct nfs_pageio_descriptor *, struct nfs_pgio_header *);

int nfs_initiate_pgio(struct rpc_clnt *, struct nfs_pgio_header *,

		      const struct nfs_rpc_ops *,

		      const struct rpc_call_ops *, int, int);

void nfs_free_request(struct nfs_page *req);

fs/nfs/pagelist.c

+4 −2
Original line number Diff line number Diff line
@@ -597,6 +597,7 @@ static void nfs_pgio_prepare(struct rpc_task *task, void *calldata) 
}



int nfs_initiate_pgio(struct rpc_clnt *clnt, struct nfs_pgio_header *hdr,

		      const struct nfs_rpc_ops *rpc_ops,

		      const struct rpc_call_ops *call_ops, int how, int flags)

{

	struct rpc_task *task;
@@ -616,7 +617,7 @@ int nfs_initiate_pgio(struct rpc_clnt *clnt, struct nfs_pgio_header *hdr, 
	};

	int ret = 0;



	hdr->rw_ops->rw_initiate(hdr, &msg, &task_setup_data, how);

	hdr->rw_ops->rw_initiate(hdr, &msg, rpc_ops, &task_setup_data, how);



	dprintk("NFS: %5u initiated pgio call "

		"(req %s/%llu, %u bytes @ offset %llu)\n",
@@ -792,7 +793,8 @@ static int nfs_generic_pg_pgios(struct nfs_pageio_descriptor *desc) 
	ret = nfs_generic_pgio(desc, hdr);

	if (ret == 0)

		ret = nfs_initiate_pgio(NFS_CLIENT(hdr->inode),

					hdr, desc->pg_rpc_callops,

					hdr, NFS_PROTO(hdr->inode),

					desc->pg_rpc_callops,

					desc->pg_ioflags, 0);

	return ret;

}

fs/nfs/read.c

+2 −1
Original line number Diff line number Diff line
@@ -168,13 +168,14 @@ static void nfs_read_completion(struct nfs_pgio_header *hdr) 


static void nfs_initiate_read(struct nfs_pgio_header *hdr,

			      struct rpc_message *msg,

			      const struct nfs_rpc_ops *rpc_ops,

			      struct rpc_task_setup *task_setup_data, int how)

{

	struct inode *inode = hdr->inode;

	int swap_flags = IS_SWAPFILE(inode) ? NFS_RPC_SWAPFLAGS : 0;



	task_setup_data->flags |= swap_flags;

	NFS_PROTO(inode)->read_setup(hdr, msg);

	rpc_ops->read_setup(hdr, msg);

}



static void

fs/nfs/write.c

+3 −3
Original line number Diff line number Diff line
@@ -1240,15 +1240,15 @@ static int flush_task_priority(int how) 


static void nfs_initiate_write(struct nfs_pgio_header *hdr,

			       struct rpc_message *msg,

			       const struct nfs_rpc_ops *rpc_ops,

			       struct rpc_task_setup *task_setup_data, int how)

{

	struct inode *inode = hdr->inode;

	int priority = flush_task_priority(how);



	task_setup_data->priority = priority;

	NFS_PROTO(inode)->write_setup(hdr, msg);

	rpc_ops->write_setup(hdr, msg);



	nfs4_state_protect_write(NFS_SERVER(inode)->nfs_client,

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

				 &task_setup_data->rpc_client, msg, hdr);

}