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

Commit 4db6e0b7 authored by Fred Isaman's avatar Fred Isaman Committed by Trond Myklebust
Browse files

NFS: merge _full and _partial read rpc_ops 



Decouple nfs_pgio_header and nfs_read_data, and have (possibly
multiple) nfs_read_datas each take a refcount on nfs_pgio_header.

For the moment keeps nfs_read_header as a way to preallocate a single
nfs_read_data with the nfs_pgio_header.  The code doesn't need this,
and would be prettier without, but given the amount of churn I am
already introducing I didn't want to play with tuning new mempools.

This also fixes bug in pnfs_ld_handle_read_error.  In the case of
desc->pg_bsize < PAGE_CACHE_SIZE, the pages list was empty, causing
replay attempt to do nothing.

Signed-off-by: default avatarFred Isaman <iisaman@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 30dd374f

fs/nfs/direct.c

+8 −2
Original line number Diff line number Diff line
@@ -319,10 +319,16 @@ static ssize_t nfs_direct_read_schedule_segment(struct nfs_direct_req *dreq, 
		bytes = min(rsize,count);



		result = -ENOMEM;

		rhdr = nfs_readhdr_alloc(nfs_page_array_len(pgbase, bytes));

		rhdr = nfs_readhdr_alloc();

		if (unlikely(!rhdr))

			break;

		data = &rhdr->rpc_data;

		data = nfs_readdata_alloc(&rhdr->header, nfs_page_array_len(pgbase, bytes));

		if (!data) {

			nfs_readhdr_free(&rhdr->header);

			break;

		}

		data->header = &rhdr->header;

		atomic_inc(&data->header->refcnt);

		pages = &data->pages;



		down_read(&current->mm->mmap_sem);

fs/nfs/internal.h

+11 −4
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ struct vfsmount *nfs_do_refmount(struct rpc_clnt *client, struct dentry *dentry) 
extern struct svc_version nfs4_callback_version1;

extern struct svc_version nfs4_callback_version4;



struct nfs_pageio_descriptor;

/* pagelist.c */

extern int __init nfs_init_nfspagecache(void);

extern void nfs_destroy_nfspagecache(void);
@@ -211,6 +212,10 @@ extern void nfs_destroy_writepagecache(void); 
extern int __init nfs_init_directcache(void);

extern void nfs_destroy_directcache(void);

extern bool nfs_pgarray_set(struct nfs_page_array *p, unsigned int pagecount);

extern void nfs_pgheader_init(struct nfs_pageio_descriptor *desc,

			      struct nfs_pgio_header *hdr,

			      void (*release)(struct nfs_pgio_header *hdr));

void nfs_set_pgio_error(struct nfs_pgio_header *hdr, int error, loff_t pos);



/* nfs2xdr.c */

extern int nfs_stat_to_errno(enum nfs_stat);
@@ -295,17 +300,19 @@ extern struct dentry *nfs4_get_root(struct super_block *, struct nfs_fh *, 
extern int nfs4_get_rootfh(struct nfs_server *server, struct nfs_fh *mntfh);

#endif



struct nfs_pageio_descriptor;

/* read.c */

extern struct nfs_read_header *nfs_readhdr_alloc(unsigned int npages);

extern void nfs_async_read_error(struct list_head *head);

extern struct nfs_read_header *nfs_readhdr_alloc(void);

extern void nfs_readhdr_free(struct nfs_pgio_header *hdr);

extern void nfs_read_completion(struct nfs_pgio_header *hdr);

extern struct nfs_read_data *nfs_readdata_alloc(struct nfs_pgio_header *hdr,

						unsigned int pagecount);

extern int nfs_initiate_read(struct rpc_clnt *clnt,

			     struct nfs_read_data *data,

			     const struct rpc_call_ops *call_ops);

extern void nfs_read_prepare(struct rpc_task *task, void *calldata);

extern int nfs_generic_pagein(struct nfs_pageio_descriptor *desc,

		struct list_head *head);



			      struct nfs_pgio_header *hdr);

extern void nfs_pageio_init_read_mds(struct nfs_pageio_descriptor *pgio,

		struct inode *inode);

extern void nfs_pageio_reset_read_mds(struct nfs_pageio_descriptor *pgio);

fs/nfs/nfs4filelayout.c

+0 −1
Original line number Diff line number Diff line
@@ -227,7 +227,6 @@ static void filelayout_read_release(void *data) 
{

	struct nfs_read_data *rdata = data;



	put_lseg(rdata->header->lseg);

	rdata->header->mds_ops->rpc_release(data);

}

fs/nfs/nfs4proc.c

+0 −2
Original line number Diff line number Diff line
@@ -3391,8 +3391,6 @@ void nfs4_reset_read(struct rpc_task *task, struct nfs_read_data *data) 
	struct inode *inode = hdr->inode;



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

	put_lseg(hdr->lseg);

	hdr->lseg = NULL;

	data->ds_clp = NULL;

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

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

fs/nfs/pagelist.c

+24 −0
Original line number Diff line number Diff line
@@ -39,6 +39,30 @@ bool nfs_pgarray_set(struct nfs_page_array *p, unsigned int pagecount) 
	return p->pagevec != NULL;

}



void nfs_pgheader_init(struct nfs_pageio_descriptor *desc,

		       struct nfs_pgio_header *hdr,

		       void (*release)(struct nfs_pgio_header *hdr))

{

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

	hdr->inode = desc->pg_inode;

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

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

	hdr->good_bytes = desc->pg_count;

	hdr->release = release;

}



void nfs_set_pgio_error(struct nfs_pgio_header *hdr, int error, loff_t pos)

{

	spin_lock(&hdr->lock);

	if (pos < hdr->io_start + hdr->good_bytes) {

		set_bit(NFS_IOHDR_ERROR, &hdr->flags);

		clear_bit(NFS_IOHDR_EOF, &hdr->flags);

		hdr->good_bytes = pos - hdr->io_start;

		hdr->error = error;

	}

	spin_unlock(&hdr->lock);

}



static inline struct nfs_page *

nfs_page_alloc(void)

{