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

NFS: Add a helper to return a pointer to the open context of a struct nfs_page 



Add a helper for when we remove the explicit pointer to the open
context.

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

fs/nfs/filelayout/filelayout.c

+2 −2
Original line number Diff line number Diff line
@@ -917,7 +917,7 @@ filelayout_pg_init_read(struct nfs_pageio_descriptor *pgio, 
	pnfs_generic_pg_check_layout(pgio);

	if (!pgio->pg_lseg) {

		pgio->pg_lseg = fl_pnfs_update_layout(pgio->pg_inode,

						      req->wb_context,

						      nfs_req_openctx(req),

						      0,

						      NFS4_MAX_UINT64,

						      IOMODE_READ,
@@ -944,7 +944,7 @@ filelayout_pg_init_write(struct nfs_pageio_descriptor *pgio, 
	pnfs_generic_pg_check_layout(pgio);

	if (!pgio->pg_lseg) {

		pgio->pg_lseg = fl_pnfs_update_layout(pgio->pg_inode,

						      req->wb_context,

						      nfs_req_openctx(req),

						      0,

						      NFS4_MAX_UINT64,

						      IOMODE_RW,

fs/nfs/flexfilelayout/flexfilelayout.c

+3 −3
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ ff_layout_pg_get_read(struct nfs_pageio_descriptor *pgio, 
{

	pnfs_put_lseg(pgio->pg_lseg);

	pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode,

					   req->wb_context,

					   nfs_req_openctx(req),

					   0,

					   NFS4_MAX_UINT64,

					   IOMODE_READ,
@@ -953,7 +953,7 @@ ff_layout_pg_init_write(struct nfs_pageio_descriptor *pgio, 
	pnfs_generic_pg_check_layout(pgio);

	if (!pgio->pg_lseg) {

		pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode,

						   req->wb_context,

						   nfs_req_openctx(req),

						   0,

						   NFS4_MAX_UINT64,

						   IOMODE_RW,
@@ -1010,7 +1010,7 @@ ff_layout_pg_get_mirror_count_write(struct nfs_pageio_descriptor *pgio, 
{

	if (!pgio->pg_lseg) {

		pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode,

						   req->wb_context,

						   nfs_req_openctx(req),

						   0,

						   NFS4_MAX_UINT64,

						   IOMODE_RW,

fs/nfs/pagelist.c

+4 −4
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ void nfs_pgheader_init(struct nfs_pageio_descriptor *desc, 


	hdr->req = nfs_list_entry(mirror->pg_list.next);

	hdr->inode = desc->pg_inode;

	hdr->cred = hdr->req->wb_context->cred;

	hdr->cred = nfs_req_openctx(hdr->req)->cred;

	hdr->io_start = req_offset(hdr->req);

	hdr->good_bytes = mirror->pg_count;

	hdr->io_completion = desc->pg_io_completion;
@@ -578,7 +578,7 @@ static void nfs_pgio_rpcsetup(struct nfs_pgio_header *hdr, 
	hdr->args.pgbase = req->wb_pgbase;

	hdr->args.pages  = hdr->page_array.pagevec;

	hdr->args.count  = count;

	hdr->args.context = get_nfs_open_context(req->wb_context);

	hdr->args.context = get_nfs_open_context(nfs_req_openctx(req));

	hdr->args.lock_context = req->wb_lock_context;

	hdr->args.stable  = NFS_UNSTABLE;

	switch (how & (FLUSH_STABLE | FLUSH_COND_STABLE)) {
@@ -935,9 +935,9 @@ static bool nfs_can_coalesce_requests(struct nfs_page *prev, 
	struct file_lock_context *flctx;



	if (prev) {

		if (!nfs_match_open_context(req->wb_context, prev->wb_context))

		if (!nfs_match_open_context(nfs_req_openctx(req), nfs_req_openctx(prev)))

			return false;

		flctx = d_inode(req->wb_context->dentry)->i_flctx;

		flctx = d_inode(nfs_req_openctx(req)->dentry)->i_flctx;

		if (flctx != NULL &&

		    !(list_empty_careful(&flctx->flc_posix) &&

		      list_empty_careful(&flctx->flc_flock)) &&

fs/nfs/pnfs.c

+2 −2
Original line number Diff line number Diff line
@@ -2436,7 +2436,7 @@ pnfs_generic_pg_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *r 
			rd_size = nfs_dreq_bytes_left(pgio->pg_dreq);



		pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode,

						   req->wb_context,

						   nfs_req_openctx(req),

						   req_offset(req),

						   rd_size,

						   IOMODE_READ,
@@ -2463,7 +2463,7 @@ pnfs_generic_pg_init_write(struct nfs_pageio_descriptor *pgio, 
	pnfs_generic_pg_check_range(pgio, req);

	if (pgio->pg_lseg == NULL) {

		pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode,

						   req->wb_context,

						   nfs_req_openctx(req),

						   req_offset(req),

						   wb_size,

						   IOMODE_RW,

fs/nfs/pnfs.h

+2 −2
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ static inline bool 
pnfs_mark_request_commit(struct nfs_page *req, struct pnfs_layout_segment *lseg,

			 struct nfs_commit_info *cinfo, u32 ds_commit_idx)

{

	struct inode *inode = d_inode(req->wb_context->dentry);

	struct inode *inode = d_inode(nfs_req_openctx(req)->dentry);

	struct pnfs_layoutdriver_type *ld = NFS_SERVER(inode)->pnfs_curr_ld;



	if (lseg == NULL || ld->mark_request_commit == NULL)
@@ -471,7 +471,7 @@ pnfs_mark_request_commit(struct nfs_page *req, struct pnfs_layout_segment *lseg, 
static inline bool

pnfs_clear_request_commit(struct nfs_page *req, struct nfs_commit_info *cinfo)

{

	struct inode *inode = d_inode(req->wb_context->dentry);

	struct inode *inode = d_inode(nfs_req_openctx(req)->dentry);

	struct pnfs_layoutdriver_type *ld = NFS_SERVER(inode)->pnfs_curr_ld;



	if (ld == NULL || ld->clear_request_commit == NULL)