more pgio cleanup
Subsystems (2)
cover more pgio cleanup
This patchset is more cleanup related to the recent pgio changes.
These patches apply on top of my "pgio" branch at:
git://git.linux-nfs.org/projects/dros/linux-nfs
Most of these patches are dealing with the merge of nfs_pgio_data into nfs_pgio_header. My recent patchset "[PATCH v3 00/18] nfs: support multiple requests per page" changes the pgio layer so that an nfs_pgio_header only ever has one nfs_pgio_data, which allows us to simplify a lot of things.
I still have some testing to do, I'd appreciate any review, especially with the reference counting change.
I'll add this patchset to the 'pgio' branch once I get some initial feedback.
Thanks,
-dros
Weston Andros Adamson (8):
nfs: move nfs_pgio_data and remove nfs_rw_header
nfs: rename members of nfs_pgio_data
nfs: merge nfs_pgio_data into _header
nfs: remove unused writeverf code
nfs: remove pgio_header refcount, related cleanup
pnfs: clean up *_resend_to_mds
nfs: clean up function decls in nfs_page.h
pnfs: merge identical functions
fs/nfs/blocklayout/blocklayout.c | 99 ++++++++------- fs/nfs/direct.c | 33 ++--- fs/nfs/internal.h | 11 +- fs/nfs/nfs3proc.c | 21 ++-- fs/nfs/nfs4_fs.h | 6 +- fs/nfs/nfs4filelayout.c | 179 +++++++++++++-------------- fs/nfs/nfs4proc.c | 105 ++++++++-------- fs/nfs/nfs4trace.h | 28 ++--- fs/nfs/objlayout/objio_osd.c | 24 ++-- fs/nfs/objlayout/objlayout.c | 81 ++++++------- fs/nfs/objlayout/objlayout.h | 8 +- fs/nfs/pagelist.c | 254 ++++++++++++++++++--------------------- fs/nfs/pnfs.c | 172 ++++++++------------------ fs/nfs/pnfs.h | 18 ++- fs/nfs/proc.c | 27 +++-- fs/nfs/read.c | 48 ++++---- fs/nfs/write.c | 80 +++++------- include/linux/nfs_page.h | 49 ++++---- include/linux/nfs_xdr.h | 33 ++--- 19 files changed, 567 insertions(+), 709 deletions(-)
Signature · 1 line
1.8.5.2 (Apple Git-48)
PATCH 1/8 nfs: move nfs_pgio_data and remove nfs_rw_header
nfs_rw_header was used to allocate an nfs_pgio_header along with an nfs_pgio_data, because a _header would need at least one _data.
Now there is only ever one nfs_pgio_data for each nfs_pgio_header -- move it to nfs_pgio_header and get rid of nfs_rw_header.
Signed-off-by Weston Andros Adamson <[email protected]>
--- fs/nfs/direct.c | 8 ++--- fs/nfs/internal.h | 6 ++-- fs/nfs/pagelist.c | 94 +++++++++++++++--------------------------------- fs/nfs/pnfs.c | 24 ++++++------- fs/nfs/read.c | 6 ++-- fs/nfs/write.c | 10 +++--- include/linux/nfs_page.h | 4 +-- include/linux/nfs_xdr.h | 38 +++++++++----------- 8 files changed, 71 insertions(+), 119 deletions(-)
fs/nfs/direct.c +4 -4
@@ -148,8 +148,8 @@ static void nfs_direct_set_hdr_verf(struct nfs_direct_req *dreq, {struct nfs_writeverf *verfp; - verfp =nfs_direct_select_verf (dreq, hdr->data->ds_clp, - hdr->data->ds_idx); + verfp =nfs_direct_select_verf (dreq, hdr->data.ds_clp, + hdr->data.ds_idx);WARN_ON_ONCE (verfp->committed >=0 );memcpy (verfp, &hdr->verf,sizeof (struct nfs_writeverf ));WARN_ON_ONCE (verfp->committed <0 );
@@ -169,8 +169,8 @@ static int nfs_direct_set_or_cmp_hdr_verf(struct nfs_direct_req *dreq, {struct nfs_writeverf *verfp; - verfp =nfs_direct_select_verf (dreq, hdr->data->ds_clp, - hdr->data->ds_idx); + verfp =nfs_direct_select_verf (dreq, hdr->data.ds_clp, + hdr->data.ds_idx);if (verfp->committed <0 ) {nfs_direct_set_hdr_verf (dreq, hdr);return 0 ;
fs/nfs/internal.h +3 -3
@@ -238,9 +238,9 @@ void nfs_set_pgio_error(struct nfs_pgio_header *hdr, int error, loff_t pos);int nfs_iocounter_wait (struct nfs_io_counter *c);extern const struct nfs_pageio_ops nfs_pgio_rw_ops; -struct nfs_rw_header *nfs_rw_header_alloc (const struct nfs_rw_ops *); -void nfs_rw_header_free (struct nfs_pgio_header *); -void nfs_pgio_data_release (struct nfs_pgio_data *); +struct nfs_pgio_header *nfs_pgio_header_alloc (const struct nfs_rw_ops *); +void nfs_pgio_header_free (struct nfs_pgio_header *); +void nfs_pgio_data_destroy (struct nfs_pgio_data *);int nfs_generic_pgio (struct nfs_pageio_descriptor *,struct nfs_pgio_header *);int nfs_initiate_pgio (struct rpc_clnt *,struct nfs_pgio_data *,const struct rpc_call_ops *,int ,int );
fs/nfs/pagelist.c +28 -66
178 lines not on this page · raw message
fs/nfs/pnfs.c +10 -14
@@ -1542,7 +1542,7 @@ pnfs_write_through_mds(struct nfs_pageio_descriptor *desc,nfs_pageio_reset_write_mds (desc); desc->pg_recoalesce =1 ; } -nfs_pgio_data_release (data); +nfs_pgio_data_destroy (data); } static enum pnfs_try_status
@@ -1571,7 +1571,7 @@ static void pnfs_do_write(struct nfs_pageio_descriptor *desc, struct nfs_pgio_header *hdr, int how) { - struct nfs_pgio_data *data = hdr->data; + struct nfs_pgio_data *data = &hdr->data;const struct rpc_call_ops *call_ops = desc->pg_rpc_callops;struct pnfs_layout_segment *lseg = desc->pg_lseg;enum pnfs_try_status trypnfs;
@@ -1586,25 +1586,23 @@ pnfs_do_write(struct nfs_pageio_descriptor *desc,static void pnfs_writehdr_free (struct nfs_pgio_header *hdr) {pnfs_put_lseg (hdr->lseg); -nfs_rw_header_free (hdr); +nfs_pgio_header_free (hdr); }EXPORT_SYMBOL_GPL (pnfs_writehdr_free);int pnfs_generic_pg_writepages (struct nfs_pageio_descriptor *desc) { -struct nfs_rw_header *whdr;struct nfs_pgio_header *hdr;int ret; - whdr =nfs_rw_header_alloc (desc->pg_rw_ops); -if (!whdr) { + hdr =nfs_pgio_header_alloc (desc->pg_rw_ops); +if (!hdr) { desc->pg_completion_ops->error_cleanup (&desc->pg_list);pnfs_put_lseg (desc->pg_lseg); desc->pg_lseg =NULL ;return -ENOMEM ; } - hdr = &whdr->header;nfs_pgheader_init (desc, hdr, pnfs_writehdr_free); hdr->lseg =pnfs_get_lseg (desc->pg_lseg);atomic_inc (&hdr->refcnt);
@@ -1692,7 +1690,7 @@ pnfs_read_through_mds(struct nfs_pageio_descriptor *desc,nfs_pageio_reset_read_mds (desc); desc->pg_recoalesce =1 ; } -nfs_pgio_data_release (data); +nfs_pgio_data_destroy (data); }/*
@@ -1723,7 +1721,7 @@ pnfs_try_to_read_data(struct nfs_pgio_data *rdata,static void pnfs_do_read (struct nfs_pageio_descriptor *desc,struct nfs_pgio_header *hdr) { -struct nfs_pgio_data *data = hdr->data; +struct nfs_pgio_data *data = &hdr->data;const struct rpc_call_ops *call_ops = desc->pg_rpc_callops;struct pnfs_layout_segment *lseg = desc->pg_lseg;enum pnfs_try_status trypnfs;
@@ -1738,26 +1736,24 @@ pnfs_do_read(struct nfs_pageio_descriptor *desc, struct nfs_pgio_header *hdr)static void pnfs_readhdr_free (struct nfs_pgio_header *hdr) {pnfs_put_lseg (hdr->lseg); -nfs_rw_header_free (hdr); +nfs_pgio_header_free (hdr); }EXPORT_SYMBOL_GPL (pnfs_readhdr_free);int pnfs_generic_pg_readpages (struct nfs_pageio_descriptor *desc) { -struct nfs_rw_header *rhdr;struct nfs_pgio_header *hdr;int ret; - rhdr =nfs_rw_header_alloc (desc->pg_rw_ops); -if (!rhdr) { + hdr =nfs_pgio_header_alloc (desc->pg_rw_ops); +if (!hdr) { desc->pg_completion_ops->error_cleanup (&desc->pg_list); ret = -ENOMEM ;pnfs_put_lseg (desc->pg_lseg); desc->pg_lseg =NULL ;return ret; } - hdr = &rhdr->header;nfs_pgheader_init (desc, hdr, pnfs_readhdr_free); hdr->lseg =pnfs_get_lseg (desc->pg_lseg);atomic_inc (&hdr->refcnt);
fs/nfs/read.c +3 -3
@@ -33,12 +33,12 @@ static const struct nfs_rw_ops nfs_rw_read_ops;static struct kmem_cache *nfs_rdata_cachep; -static struct nfs_rw_header *nfs_readhdr_alloc (void ) +static struct nfs_pgio_header *nfs_readhdr_alloc (void ) {return kmem_cache_zalloc (nfs_rdata_cachep,GFP_KERNEL ); } -static void nfs_readhdr_free (struct nfs_rw_header *rhdr) +static void nfs_readhdr_free (struct nfs_pgio_header *rhdr) {kmem_cache_free (nfs_rdata_cachep, rhdr); }
@@ -404,7 +404,7 @@ out:int __init nfs_init_readpagecache (void ) { nfs_rdata_cachep =kmem_cache_create ("nfs_read_data" , -sizeof (struct nfs_rw_header ), +sizeof (struct nfs_pgio_header ),0 ,SLAB_HWCACHE_ALIGN ,NULL );if (nfs_rdata_cachep ==NULL )
fs/nfs/write.c +5 -5
@@ -70,18 +70,18 @@ void nfs_commit_free(struct nfs_commit_data *p) }EXPORT_SYMBOL_GPL (nfs_commit_free); -static struct nfs_rw_header *nfs_writehdr_alloc (void ) +static struct nfs_pgio_header *nfs_writehdr_alloc (void ) { -struct nfs_rw_header *p =mempool_alloc (nfs_wdata_mempool,GFP_NOIO ); +struct nfs_pgio_header *p =mempool_alloc (nfs_wdata_mempool,GFP_NOIO );if (p)memset (p,0 ,sizeof (*p));return p; } -static void nfs_writehdr_free (struct nfs_rw_header *whdr) +static void nfs_writehdr_free (struct nfs_pgio_header *hdr) { -mempool_free (whdr, nfs_wdata_mempool); +mempool_free (hdr, nfs_wdata_mempool); }static void nfs_context_set_write_error (struct nfs_open_context *ctx,int error)
@@ -1653,7 +1653,7 @@ int nfs_migrate_page(struct address_space *mapping, struct page *newpage,int __init nfs_init_writepagecache (void ) { nfs_wdata_cachep =kmem_cache_create ("nfs_write_data" , -sizeof (struct nfs_rw_header ), +sizeof (struct nfs_pgio_header ),0 ,SLAB_HWCACHE_ALIGN ,NULL );if (nfs_wdata_cachep ==NULL )
include/linux/nfs_page.h +2 -2
@@ -62,8 +62,8 @@ struct nfs_pageio_ops {struct nfs_rw_ops {const fmode_t rw_mode; -struct nfs_rw_header *(*rw_alloc_header)(void ); -void (*rw_free_header)(struct nfs_rw_header *); +struct nfs_pgio_header *(*rw_alloc_header)(void ); +void (*rw_free_header)(struct nfs_pgio_header *);void (*rw_release)(struct nfs_pgio_data *);int (*rw_done)(struct rpc_task *,struct nfs_pgio_data *,struct inode *);void (*rw_result)(struct rpc_task *,struct nfs_pgio_data *);
include/linux/nfs_xdr.h +16 -22
@@ -1257,13 +1257,27 @@ enum { NFS_IOHDR_NEED_RESCHED, }; -struct nfs_pgio_data ; +struct nfs_pgio_data { +struct nfs_pgio_header *header; +struct list_head list; +struct rpc_task task; +struct nfs_fattr fattr; +struct nfs_writeverf verf;/* Used for writes */ +struct nfs_pgio_args args;/* argument struct */ +struct nfs_pgio_res res;/* result struct */ +unsigned long timestamp;/* For lease renewal */ +int (*pgio_done_cb)(struct rpc_task *task,struct nfs_pgio_data *data); +__u64 mds_offset;/* Filelayout dense stripe */ +struct nfs_page_array pages; +struct nfs_client *ds_clp;/* pNFS data server */ +int ds_idx;/* ds index if ds_clp is set */ +};struct nfs_pgio_header {struct inode *inode;struct rpc_cred *cred;struct list_head pages; -struct nfs_pgio_data *data; +struct nfs_pgio_data data;atomic_t refcnt;struct nfs_page *req;struct nfs_writeverf verf;/* Used for writes */
@@ -1283,26 +1297,6 @@ struct nfs_pgio_header {unsigned long flags; }; -struct nfs_pgio_data { -struct nfs_pgio_header *header; -struct rpc_task task; -struct nfs_fattr fattr; -struct nfs_writeverf verf;/* Used for writes */ -struct nfs_pgio_args args;/* argument struct */ -struct nfs_pgio_res res;/* result struct */ -unsigned long timestamp;/* For lease renewal */ -int (*pgio_done_cb) (struct rpc_task *task,struct nfs_pgio_data *data); -__u64 mds_offset;/* Filelayout dense stripe */ -struct nfs_page_array pages; -struct nfs_client *ds_clp;/* pNFS data server */ -int ds_idx;/* ds index if ds_clp is set */ -}; - -struct nfs_rw_header { -struct nfs_pgio_header header; -struct nfs_pgio_data rpc_data; -}; -struct nfs_mds_commit_info {atomic_t rpcs_out;unsigned long ncommit;
Signature · 1 line
1.8.5.2 (Apple Git-48)
PATCH 2/8 nfs: rename members of nfs_pgio_data
In reply to Weston Andros AdamsonRename "verf" to "writeverf" and "pages" to "page_array" to prepare for merge of nfs_pgio_data and nfs_pgio_header.
Signed-off-by Weston Andros Adamson <[email protected]>
--- fs/nfs/blocklayout/blocklayout.c | 17 ++++++++++------- fs/nfs/objlayout/objlayout.c | 4 ++-- fs/nfs/pagelist.c | 12 ++++++------ fs/nfs/write.c | 9 +++++---- include/linux/nfs_xdr.h | 4 ++-- 5 files changed, 25 insertions(+), 21 deletions(-)
fs/nfs/blocklayout/blocklayout.c +10 -7
@@ -258,7 +258,8 @@ bl_read_pagelist(struct nfs_pgio_data *rdata)const bool is_dio = (header->dreq !=NULL );dprintk ("%s enter nr_pages %u offset %lld count %u\n" , __func__, - rdata->pages.npages, f_offset, (unsigned int )rdata->args.count); + rdata->page_array.npages, f_offset, + (unsigned int )rdata->args.count); par =alloc_parallel (rdata);if (!par)
@@ -268,7 +269,7 @@ bl_read_pagelist(struct nfs_pgio_data *rdata) isect = (sector_t) (f_offset >>SECTOR_SHIFT );/* Code assumes extents are page-aligned */ -for (i = pg_index; i < rdata->pages.npages; i++) { +for (i = pg_index; i < rdata->page_array.npages; i++) {if (!extent_length) {/* We've used up the previous extent */ bl_put_extent (be);
@@ -317,7 +318,8 @@ bl_read_pagelist(struct nfs_pgio_data *rdata)struct pnfs_block_extent *be_read; be_read = (hole && cow_read) ? cow_read : be; - bio = do_add_page_to_bio(bio, rdata->pages.npages - i, + bio = do_add_page_to_bio(bio, + rdata->page_array.npages - i, READ, isect, pages[i], be_read, bl_end_io_read, par,
@@ -446,7 +448,7 @@ static void bl_end_par_io_write(void *data, int num_se) } wdata->task.tk_status = wdata->header->pnfs_error; - wdata->verf.committed =NFS_FILE_SYNC ; + wdata->writeverf.committed =NFS_FILE_SYNC ;INIT_WORK (&wdata->task.u.tk_work, bl_write_cleanup);schedule_work (&wdata->task.u.tk_work); }
@@ -699,7 +701,7 @@ bl_write_pagelist(struct nfs_pgio_data *wdata, int sync)dprintk ("pnfsblock nonblock aligned DIO writes. Resend MDS\n" ); goto out_mds; } -/* At this point, wdata->pages is a (sequential) list of nfs_pages. +/* At this point, wdata->page_aray is a (sequential) list of nfs_pages. * We want to write each, and if there is an error set pnfs_error * to have it redone using nfs. */
@@ -791,7 +793,7 @@ next_page:/* Middle pages */ pg_index = wdata->args.pgbase >>PAGE_CACHE_SHIFT ; -for (i = pg_index; i < wdata->pages.npages; i++) { +for (i = pg_index; i < wdata->page_array.npages; i++) {if (!extent_length) {/* We've used up the previous extent */ bl_put_extent (be);
@@ -862,7 +864,8 @@ next_page: } - bio =do_add_page_to_bio (bio, wdata->pages.npages - i,WRITE , + bio =do_add_page_to_bio (bio, wdata->page_array.npages - i, +WRITE , isect, pages[i], be, bl_end_io_write, par, pg_offset, pg_len);
fs/nfs/objlayout/objlayout.c +2 -2
@@ -329,7 +329,7 @@ objlayout_write_done(struct objlayout_io_res *oir, ssize_t status, bool sync) oir->status = wdata->task.tk_status = status;if (status >=0 ) { wdata->res.count = status; - wdata->verf.committed = oir->committed; + wdata->writeverf.committed = oir->committed; }else { wdata->header->pnfs_error = status; }
@@ -337,7 +337,7 @@ objlayout_write_done(struct objlayout_io_res *oir, ssize_t status, bool sync)/* must not use oir after this point */ dprintk ("%s: Return status %zd committed %d sync=%d\n" , __func__, - status, wdata->verf.committed, sync); + status, wdata->writeverf.committed, sync);if (sync)pnfs_ld_write_done (wdata);
fs/nfs/pagelist.c +6 -6
@@ -485,7 +485,7 @@ EXPORT_SYMBOL_GPL(nfs_pgio_header_free);static bool nfs_pgio_data_init (struct nfs_pgio_header *hdr,unsigned int pagecount) { -if (nfs_pgarray_set (&hdr->data.pages, pagecount)) { +if (nfs_pgarray_set (&hdr->data.page_array, pagecount)) { hdr->data.header = hdr;atomic_inc (&hdr->refcnt);return true;
@@ -502,8 +502,8 @@ void nfs_pgio_data_destroy(struct nfs_pgio_data *data)struct nfs_pgio_header *hdr = data->header;put_nfs_open_context (data->args.context); -if (data->pages.pagevec != data->pages.page_array) -kfree (data->pages.pagevec); +if (data->page_array.pagevec != data->page_array.page_array) +kfree (data->page_array.pagevec);if (atomic_dec_and_test (&hdr->refcnt)) hdr->completion_ops->completion (hdr); }
@@ -531,7 +531,7 @@ static void nfs_pgio_rpcsetup(struct nfs_pgio_data *data,/* pnfs_set_layoutcommit needs this */ data->mds_offset = data->args.offset; data->args.pgbase = req->wb_pgbase + offset; - data->args.pages = data->pages.pagevec; + data->args.pages = data->page_array.pagevec; data->args.count = count; data->args.context =get_nfs_open_context (req->wb_context); data->args.lock_context = req->wb_lock_context;
@@ -549,7 +549,7 @@ static void nfs_pgio_rpcsetup(struct nfs_pgio_data *data, data->res.fattr = &data->fattr; data->res.count = count; data->res.eof =0 ; - data->res.verf = &data->verf; + data->res.verf = &data->writeverf;nfs_fattr_init (&data->fattr); }
@@ -719,7 +719,7 @@ int nfs_generic_pgio(struct nfs_pageio_descriptor *desc, data = &hdr->data;nfs_init_cinfo (&cinfo, desc->pg_inode, desc->pg_dreq); - pages = data->pages.pagevec; + pages = data->page_array.pagevec;while (!list_empty (head)) { req =nfs_list_entry (head->next);nfs_list_remove_request (req);
fs/nfs/write.c +5 -4
@@ -598,9 +598,9 @@ nfs_clear_request_commit(struct nfs_page *req)static inline int nfs_write_need_commit (struct nfs_pgio_data *data) { -if (data->verf.committed ==NFS_DATA_SYNC ) +if (data->writeverf.committed ==NFS_DATA_SYNC )return data->header->lseg ==NULL ; -return data->verf.committed !=NFS_FILE_SYNC ; +return data->writeverf.committed !=NFS_FILE_SYNC ; }#else
@@ -1093,8 +1093,9 @@ static void nfs_writeback_release_common(struct nfs_pgio_data *data)if (test_bit (NFS_IOHDR_NEED_RESCHED , &hdr->flags)) ;/* Do nothing */ else if (!test_and_set_bit (NFS_IOHDR_NEED_COMMIT , &hdr->flags)) -memcpy (&hdr->verf, &data->verf,sizeof (hdr->verf)); -else if (memcmp (&hdr->verf, &data->verf,sizeof (hdr->verf))) +memcpy (&hdr->verf, &data->writeverf,sizeof (hdr->verf)); +else if (memcmp (&hdr->verf, &data->writeverf, +sizeof (hdr->verf)))set_bit (NFS_IOHDR_NEED_RESCHED , &hdr->flags);spin_unlock (&hdr->lock); }
include/linux/nfs_xdr.h +2 -2
@@ -1262,13 +1262,13 @@ struct nfs_pgio_data {struct list_head list;struct rpc_task task;struct nfs_fattr fattr; -struct nfs_writeverf verf;/* Used for writes */ +struct nfs_writeverf writeverf;/* Used for writes */ struct nfs_pgio_args args;/* argument struct */ struct nfs_pgio_res res;/* result struct */ unsigned long timestamp;/* For lease renewal */ int (*pgio_done_cb)(struct rpc_task *task,struct nfs_pgio_data *data);__u64 mds_offset;/* Filelayout dense stripe */ -struct nfs_page_array pages; +struct nfs_page_array page_array;struct nfs_client *ds_clp;/* pNFS data server */ int ds_idx;/* ds index if ds_clp is set */ };
Signature · 1 line
1.8.5.2 (Apple Git-48)
PATCH 3/8 nfs: merge nfs_pgio_data into _header
In reply to Weston Andros Adamsonstruct nfs_pgio_data only exists as a member of nfs_pgio_header, but is passed around everywhere, because there used to be multiple _data structs per _header. Many of these functions then use the _data to find a pointer to the _header. This patch cleans this up by merging the nfs_pgio_data structure into nfs_pgio_header and passing nfs_pgio_header around instead.
Signed-off-by Weston Andros Adamson <[email protected]>
--- fs/nfs/blocklayout/blocklayout.c | 98 +++++++++++------------ fs/nfs/direct.c | 8 +- fs/nfs/internal.h | 6 +- fs/nfs/nfs3proc.c | 21 ++--- fs/nfs/nfs4_fs.h | 6 +- fs/nfs/nfs4filelayout.c | 169 +++++++++++++++++++-------------------- fs/nfs/nfs4proc.c | 105 ++++++++++++------------ fs/nfs/nfs4trace.h | 28 +++---- fs/nfs/objlayout/objio_osd.c | 24 +++--- fs/nfs/objlayout/objlayout.c | 81 +++++++++---------- fs/nfs/objlayout/objlayout.h | 8 +- fs/nfs/pagelist.c | 117 +++++++++++++-------------- fs/nfs/pnfs.c | 80 ++++++++---------- fs/nfs/pnfs.h | 10 +-- fs/nfs/proc.c | 27 ++++--- fs/nfs/read.c | 42 +++++----- fs/nfs/write.c | 56 ++++++------- include/linux/nfs_page.h | 9 ++- include/linux/nfs_xdr.h | 43 +++++----- 19 files changed, 458 insertions(+), 480 deletions(-)
fs/nfs/blocklayout/blocklayout.c +47 -51
@@ -210,8 +210,7 @@ static void bl_end_io_read(struct bio *bio, int err)SetPageUptodate (bvec->bv_page);if (err) { -struct nfs_pgio_data *rdata = par->data; -struct nfs_pgio_header *header = rdata->header; +struct nfs_pgio_header *header = par->data;if (!header->pnfs_error) header->pnfs_error = -EIO ;
@@ -224,44 +223,44 @@ static void bl_end_io_read(struct bio *bio, int err)static void bl_read_cleanup (struct work_struct *work) {struct rpc_task *task; -struct nfs_pgio_data *rdata; +struct nfs_pgio_header *hdr;dprintk ("%s enter\n" , __func__); task = container_of(work, struct rpc_task, u.tk_work); - rdata = container_of(task, struct nfs_pgio_data, task); -pnfs_ld_read_done (rdata); + hdr = container_of(task, struct nfs_pgio_header, task); +pnfs_ld_read_done (hdr); }static void bl_end_par_io_read (void *data,int unused) { -struct nfs_pgio_data *rdata = data; +struct nfs_pgio_header *hdr = data; - rdata->task.tk_status = rdata->header->pnfs_error; -INIT_WORK (&rdata->task.u.tk_work, bl_read_cleanup); -schedule_work (&rdata->task.u.tk_work); + hdr->task.tk_status = hdr->pnfs_error; +INIT_WORK (&hdr->task.u.tk_work, bl_read_cleanup); +schedule_work (&hdr->task.u.tk_work); }static enum pnfs_try_status -bl_read_pagelist (struct nfs_pgio_data *rdata) +bl_read_pagelist (struct nfs_pgio_header *hdr) { -struct nfs_pgio_header *header = rdata->header; +struct nfs_pgio_header *header = hdr;int i, hole;struct bio *bio =NULL ;struct pnfs_block_extent *be =NULL , *cow_read =NULL ;sector_t isect, extent_length =0 ;struct parallel_io *par; -loff_t f_offset = rdata->args.offset; -size_t bytes_left = rdata->args.count; +loff_t f_offset = hdr->args.offset; +size_t bytes_left = hdr->args.count;unsigned int pg_offset, pg_len; -struct page **pages = rdata->args.pages; -int pg_index = rdata->args.pgbase >>PAGE_CACHE_SHIFT ; +struct page **pages = hdr->args.pages; +int pg_index = hdr->args.pgbase >>PAGE_CACHE_SHIFT ;const bool is_dio = (header->dreq !=NULL );dprintk ("%s enter nr_pages %u offset %lld count %u\n" , __func__, - rdata->page_array.npages, f_offset, - (unsigned int )rdata->args.count); + hdr->page_array.npages, f_offset, + (unsigned int )hdr->args.count); - par =alloc_parallel (rdata); + par =alloc_parallel (hdr);if (!par) goto use_mds; par->pnfs_callback = bl_end_par_io_read;
@@ -269,7 +268,7 @@ bl_read_pagelist(struct nfs_pgio_data *rdata) isect = (sector_t) (f_offset >>SECTOR_SHIFT );/* Code assumes extents are page-aligned */ -for (i = pg_index; i < rdata->page_array.npages; i++) { +for (i = pg_index; i < hdr->page_array.npages; i++) {if (!extent_length) {/* We've used up the previous extent */ bl_put_extent (be);
@@ -319,7 +318,7 @@ bl_read_pagelist(struct nfs_pgio_data *rdata) be_read = (hole && cow_read) ? cow_read : be; bio = do_add_page_to_bio(bio, - rdata->page_array.npages - i, + hdr->page_array.npages - i, READ, isect, pages[i], be_read, bl_end_io_read, par,
@@ -334,10 +333,10 @@ bl_read_pagelist(struct nfs_pgio_data *rdata) extent_length -=PAGE_CACHE_SECTORS ; }if ((isect <<SECTOR_SHIFT ) >= header->inode->i_size) { - rdata->res.eof =1 ; - rdata->res.count = header->inode->i_size - rdata->args.offset; + hdr->res.eof =1 ; + hdr->res.count = header->inode->i_size - hdr->args.offset; }else { - rdata->res.count = (isect <<SECTOR_SHIFT ) - rdata->args.offset; + hdr->res.count = (isect <<SECTOR_SHIFT ) - hdr->args.offset; } out:bl_put_extent (be);
@@ -392,8 +391,7 @@ static void bl_end_io_write_zero(struct bio *bio, int err) }if (unlikely (err)) { -struct nfs_pgio_data *data = par->data; -struct nfs_pgio_header *header = data->header; +struct nfs_pgio_header *header = par->data;if (!header->pnfs_error) header->pnfs_error = -EIO ;
@@ -407,8 +405,7 @@ static void bl_end_io_write(struct bio *bio, int err) {struct parallel_io *par = bio->bi_private;const int uptodate =test_bit (BIO_UPTODATE , &bio->bi_flags); -struct nfs_pgio_data *data = par->data; -struct nfs_pgio_header *header = data->header; +struct nfs_pgio_header *header = par->data;if (!uptodate) {if (!header->pnfs_error)
@@ -425,32 +422,32 @@ static void bl_end_io_write(struct bio *bio, int err)static void bl_write_cleanup (struct work_struct *work) {struct rpc_task *task; -struct nfs_pgio_data *wdata; +struct nfs_pgio_header *hdr;dprintk ("%s enter\n" , __func__); task = container_of(work, struct rpc_task, u.tk_work); - wdata = container_of(task, struct nfs_pgio_data, task); -if (likely (!wdata->header->pnfs_error)) { + hdr = container_of(task, struct nfs_pgio_header, task); +if (likely (!hdr->pnfs_error)) {/* Marks for LAYOUTCOMMIT */ -mark_extents_written (BLK_LSEG2EXT (wdata->header->lseg), - wdata->args.offset, wdata->args.count); +mark_extents_written (BLK_LSEG2EXT (hdr->lseg), + hdr->args.offset, hdr->args.count); } -pnfs_ld_write_done (wdata); +pnfs_ld_write_done (hdr); }/* Called when last of bios associated with a bl_write_pagelist call finishes */ static void bl_end_par_io_write (void *data,int num_se) { -struct nfs_pgio_data *wdata = data; +struct nfs_pgio_header *hdr = data; -if (unlikely (wdata->header->pnfs_error)) { -bl_free_short_extents (&BLK_LSEG2EXT (wdata->header->lseg)->bl_inval, +if (unlikely (hdr->pnfs_error)) { +bl_free_short_extents (&BLK_LSEG2EXT (hdr->lseg)->bl_inval, num_se); } - wdata->task.tk_status = wdata->header->pnfs_error; - wdata->writeverf.committed =NFS_FILE_SYNC ; -INIT_WORK (&wdata->task.u.tk_work, bl_write_cleanup); -schedule_work (&wdata->task.u.tk_work); + hdr->task.tk_status = hdr->pnfs_error; + hdr->writeverf.committed =NFS_FILE_SYNC ; +INIT_WORK (&hdr->task.u.tk_work, bl_write_cleanup); +schedule_work (&hdr->task.u.tk_work); }/* FIXME STUB - mark intersection of layout and page as bad, so is not
@@ -675,18 +672,17 @@ check_page: }static enum pnfs_try_status -bl_write_pagelist (struct nfs_pgio_data *wdata,int sync) +bl_write_pagelist (struct nfs_pgio_header *header,int sync) { -struct nfs_pgio_header *header = wdata->header;int i, ret, npg_zero, pg_index, last =0 ;struct bio *bio =NULL ;struct pnfs_block_extent *be =NULL , *cow_read =NULL ;sector_t isect, last_isect =0 , extent_length =0 ;struct parallel_io *par =NULL ; -loff_t offset = wdata->args.offset; -size_t count = wdata->args.count; +loff_t offset = header->args.offset; +size_t count = header->args.count;unsigned int pg_offset, pg_len, saved_len; -struct page **pages = wdata->args.pages; +struct page **pages = header->args.pages;struct page *page;pgoff_t index;u64 temp;
@@ -701,11 +697,11 @@ bl_write_pagelist(struct nfs_pgio_data *wdata, int sync)dprintk ("pnfsblock nonblock aligned DIO writes. Resend MDS\n" ); goto out_mds; } -/* At this point, wdata->page_aray is a (sequential) list of nfs_pages. +/* At this point, header->page_aray is a (sequential) list of nfs_pages. * We want to write each, and if there is an error set pnfs_error * to have it redone using nfs. */ - par =alloc_parallel (wdata); + par =alloc_parallel (header);if (!par) goto out_mds; par->pnfs_callback = bl_end_par_io_write;
@@ -792,8 +788,8 @@ next_page: bio =bl_submit_bio (WRITE , bio);/* Middle pages */ - pg_index = wdata->args.pgbase >>PAGE_CACHE_SHIFT ; -for (i = pg_index; i < wdata->page_array.npages; i++) { + pg_index = header->args.pgbase >>PAGE_CACHE_SHIFT ; +for (i = pg_index; i < header->page_array.npages; i++) {if (!extent_length) {/* We've used up the previous extent */ bl_put_extent (be);
@@ -864,7 +860,7 @@ next_page: } - bio = do_add_page_to_bio(bio, wdata->page_array.npages - i, + bio = do_add_page_to_bio(bio, header->page_array.npages - i, WRITE, isect, pages[i], be, bl_end_io_write, par,
@@ -893,7 +889,7 @@ next_page: } write_done: - wdata->res.count = wdata->args.count; + header->res.count = header->args.count; out:bl_put_extent (be);bl_put_extent (cow_read);
fs/nfs/direct.c +4 -4
@@ -148,8 +148,8 @@ static void nfs_direct_set_hdr_verf(struct nfs_direct_req *dreq, {struct nfs_writeverf *verfp; - verfp =nfs_direct_select_verf (dreq, hdr->data.ds_clp, - hdr->data.ds_idx); + verfp =nfs_direct_select_verf (dreq, hdr->ds_clp, + hdr->ds_idx);WARN_ON_ONCE (verfp->committed >=0 );memcpy (verfp, &hdr->verf,sizeof (struct nfs_writeverf ));WARN_ON_ONCE (verfp->committed <0 );
@@ -169,8 +169,8 @@ static int nfs_direct_set_or_cmp_hdr_verf(struct nfs_direct_req *dreq, {struct nfs_writeverf *verfp; - verfp =nfs_direct_select_verf (dreq, hdr->data.ds_clp, - hdr->data.ds_idx); + verfp =nfs_direct_select_verf (dreq, hdr->ds_clp, + hdr->ds_idx);if (verfp->committed <0 ) {nfs_direct_set_hdr_verf (dreq, hdr);return 0 ;
fs/nfs/internal.h +3 -3
@@ -240,9 +240,9 @@ int nfs_iocounter_wait(struct nfs_io_counter *c);extern const struct nfs_pageio_ops nfs_pgio_rw_ops;struct nfs_pgio_header *nfs_pgio_header_alloc (const struct nfs_rw_ops *);void nfs_pgio_header_free (struct nfs_pgio_header *); -void nfs_pgio_data_destroy (struct nfs_pgio_data *); +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_data *, +int nfs_initiate_pgio (struct rpc_clnt *,struct nfs_pgio_header *,const struct rpc_call_ops *,int ,int );static inline void nfs_iocounter_init (struct nfs_io_counter *c)
@@ -483,7 +483,7 @@ static inline void nfs_inode_dio_wait(struct inode *inode)extern ssize_t nfs_dreq_bytes_left (struct nfs_direct_req *dreq);/* nfs4proc.c */ -extern void __nfs4_read_done_cb (struct nfs_pgio_data *); +extern void __nfs4_read_done_cb (struct nfs_pgio_header *);extern struct nfs_client *nfs4_init_client (struct nfs_client *clp,const struct rpc_timeout *timeparms,const char *ip_addr);
fs/nfs/nfs3proc.c +12 -9
@@ -795,41 +795,44 @@ nfs3_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle,return status; } -static int nfs3_read_done (struct rpc_task *task,struct nfs_pgio_data *data) +static int nfs3_read_done (struct rpc_task *task,struct nfs_pgio_header *hdr) { -struct inode *inode = data->header->inode; +struct inode *inode = hdr->inode;if (nfs3_async_handle_jukebox (task, inode))return -EAGAIN ;nfs_invalidate_atime (inode); -nfs_refresh_inode (inode, &data->fattr); +nfs_refresh_inode (inode, &hdr->fattr);return 0 ; } -static void nfs3_proc_read_setup (struct nfs_pgio_data *data,struct rpc_message *msg) +static void nfs3_proc_read_setup (struct nfs_pgio_header *hdr, +struct rpc_message *msg) { msg->rpc_proc = &nfs3_procedures[NFS3PROC_READ ]; } -static int nfs3_proc_pgio_rpc_prepare (struct rpc_task *task,struct nfs_pgio_data *data) +static int nfs3_proc_pgio_rpc_prepare (struct rpc_task *task, +struct nfs_pgio_header *hdr) {rpc_call_start (task);return 0 ; } -static int nfs3_write_done (struct rpc_task *task,struct nfs_pgio_data *data) +static int nfs3_write_done (struct rpc_task *task,struct nfs_pgio_header *hdr) { -struct inode *inode = data->header->inode; +struct inode *inode = hdr->inode;if (nfs3_async_handle_jukebox (task, inode))return -EAGAIN ;if (task->tk_status >=0 ) -nfs_post_op_update_inode_force_wcc (inode, data->res.fattr); +nfs_post_op_update_inode_force_wcc (inode, hdr->res.fattr);return 0 ; } -static void nfs3_proc_write_setup (struct nfs_pgio_data *data,struct rpc_message *msg) +static void nfs3_proc_write_setup (struct nfs_pgio_header *hdr, +struct rpc_message *msg) { msg->rpc_proc = &nfs3_procedures[NFS3PROC_WRITE ]; }
fs/nfs/nfs4_fs.h +3 -3
@@ -337,11 +337,11 @@ nfs4_state_protect(struct nfs_client *clp, unsigned long sp4_mode,*/ static inline void nfs4_state_protect_write (struct nfs_client *clp,struct rpc_clnt **clntp, -struct rpc_message *msg,struct nfs_pgio_data *wdata) +struct rpc_message *msg,struct nfs_pgio_header *hdr) {if (_nfs4_state_protect (clp,NFS_SP4_MACH_CRED_WRITE , clntp, msg) && !test_bit (NFS_SP4_MACH_CRED_COMMIT , &clp->cl_sp4_flags)) - wdata->args.stable =NFS_FILE_SYNC ; + hdr->args.stable =NFS_FILE_SYNC ; }#else /* CONFIG_NFS_v4_1 */ static inline struct nfs4_session *nfs4_get_session (const struct nfs_server *server)
@@ -369,7 +369,7 @@ nfs4_state_protect(struct nfs_client *clp, unsigned long sp4_flags,static inline void nfs4_state_protect_write (struct nfs_client *clp,struct rpc_clnt **clntp, -struct rpc_message *msg,struct nfs_pgio_data *wdata) +struct rpc_message *msg,struct nfs_pgio_header *hdr) { }#endif /* CONFIG_NFS_V4_1 */
fs/nfs/nfs4filelayout.c +81 -88
365 lines not on this page · raw message
fs/nfs/nfs4proc.c +55 -50
179 lines not on this page · raw message
fs/nfs/nfs4trace.h +14 -14
@@ -932,11 +932,11 @@ DEFINE_NFS4_IDMAP_EVENT(nfs4_map_gid_to_group); DECLARE_EVENT_CLASS(nfs4_read_event, TP_PROTO( - const struct nfs_pgio_data *data, + const struct nfs_pgio_header *hdr, int error ), - TP_ARGS(data, error), + TP_ARGS(hdr, error), TP_STRUCT__entry( __field(dev_t, dev)
@@ -948,12 +948,12 @@ DECLARE_EVENT_CLASS(nfs4_read_event, ),TP_fast_assign ( - const struct inode *inode = data->header->inode; + const struct inode *inode = hdr->inode; __entry->dev = inode->i_sb->s_dev; __entry->fileid =NFS_FILEID (inode); __entry->fhandle =nfs_fhandle_hash (NFS_FH (inode)); - __entry->offset = data->args.offset; - __entry->count = data->args.count; + __entry->offset = hdr->args.offset; + __entry->count = hdr->args.count; __entry->error = error; ),
@@ -972,10 +972,10 @@ DECLARE_EVENT_CLASS(nfs4_read_event,#define DEFINE_NFS4_READ_EVENT (name) \ DEFINE_EVENT(nfs4_read_event, name, \ TP_PROTO( \ - const struct nfs_pgio_data *data, \ + const struct nfs_pgio_header *hdr, \ int error \ ), \ - TP_ARGS(data, error)) + TP_ARGS(hdr, error))DEFINE_NFS4_READ_EVENT (nfs4_read);#ifdef CONFIG_NFS_V4_1 DEFINE_NFS4_READ_EVENT (nfs4_pnfs_read);
@@ -983,11 +983,11 @@ DEFINE_NFS4_READ_EVENT(nfs4_pnfs_read); DECLARE_EVENT_CLASS(nfs4_write_event, TP_PROTO( - const struct nfs_pgio_data *data, + const struct nfs_pgio_header *hdr, int error ), - TP_ARGS(data, error), + TP_ARGS(hdr, error), TP_STRUCT__entry( __field(dev_t, dev)
@@ -999,12 +999,12 @@ DECLARE_EVENT_CLASS(nfs4_write_event, ),TP_fast_assign ( - const struct inode *inode = data->header->inode; + const struct inode *inode = hdr->inode; __entry->dev = inode->i_sb->s_dev; __entry->fileid =NFS_FILEID (inode); __entry->fhandle =nfs_fhandle_hash (NFS_FH (inode)); - __entry->offset = data->args.offset; - __entry->count = data->args.count; + __entry->offset = hdr->args.offset; + __entry->count = hdr->args.count; __entry->error = error; ),
@@ -1024,10 +1024,10 @@ DECLARE_EVENT_CLASS(nfs4_write_event,#define DEFINE_NFS4_WRITE_EVENT (name) \ DEFINE_EVENT(nfs4_write_event, name, \ TP_PROTO( \ - const struct nfs_pgio_data *data, \ + const struct nfs_pgio_header *hdr, \ int error \ ), \ - TP_ARGS(data, error)) + TP_ARGS(hdr, error))DEFINE_NFS4_WRITE_EVENT (nfs4_write);#ifdef CONFIG_NFS_V4_1 DEFINE_NFS4_WRITE_EVENT (nfs4_pnfs_write);
fs/nfs/objlayout/objio_osd.c +11 -13
@@ -439,22 +439,21 @@ static void _read_done(struct ore_io_state *ios, void *private)objlayout_read_done (&objios->oir, status, objios->sync); } -int objio_read_pagelist (struct nfs_pgio_data *rdata) +int objio_read_pagelist (struct nfs_pgio_header *hdr) { -struct nfs_pgio_header *hdr = rdata->header;struct objio_state *objios;int ret; ret =objio_alloc_io_state (NFS_I (hdr->inode)->layout, true, - hdr->lseg, rdata->args.pages, rdata->args.pgbase, - rdata->args.offset, rdata->args.count, rdata, + hdr->lseg, hdr->args.pages, hdr->args.pgbase, + hdr->args.offset, hdr->args.count, hdr,GFP_KERNEL , &objios);if (unlikely (ret))return ret; objios->ios->done = _read_done;dprintk ("%s: offset=0x%llx length=0x%x\n" , __func__, - rdata->args.offset, rdata->args.count); + hdr->args.offset, hdr->args.count); ret =ore_read (objios->ios);if (unlikely (ret))objio_free_result (&objios->oir);
@@ -487,11 +486,11 @@ static void _write_done(struct ore_io_state *ios, void *private)static struct page *__r4w_get_page (void *priv,u64 offset,bool *uptodate) {struct objio_state *objios = priv; -struct nfs_pgio_data *wdata = objios->oir.rpcdata; -struct address_space *mapping = wdata->header->inode->i_mapping; +struct nfs_pgio_header *hdr = objios->oir.rpcdata; +struct address_space *mapping = hdr->inode->i_mapping;pgoff_t index = offset /PAGE_SIZE ;struct page *page; -loff_t i_size =i_size_read (wdata->header->inode); +loff_t i_size =i_size_read (hdr->inode);if (offset >= i_size) { *uptodate = true;
@@ -531,15 +530,14 @@ static const struct _ore_r4w_op _r4w_op = { .put_page = &__r4w_put_page, }; -int objio_write_pagelist (struct nfs_pgio_data *wdata,int how) +int objio_write_pagelist (struct nfs_pgio_header *hdr,int how) { -struct nfs_pgio_header *hdr = wdata->header;struct objio_state *objios;int ret; ret =objio_alloc_io_state (NFS_I (hdr->inode)->layout, false, - hdr->lseg, wdata->args.pages, wdata->args.pgbase, - wdata->args.offset, wdata->args.count, wdata,GFP_NOFS , + hdr->lseg, hdr->args.pages, hdr->args.pgbase, + hdr->args.offset, hdr->args.count, hdr,GFP_NOFS , &objios);if (unlikely (ret))return ret;
@@ -551,7 +549,7 @@ int objio_write_pagelist(struct nfs_pgio_data *wdata, int how) objios->ios->done = _write_done;dprintk ("%s: offset=0x%llx length=0x%x\n" , __func__, - wdata->args.offset, wdata->args.count); + hdr->args.offset, hdr->args.count); ret =ore_write (objios->ios);if (unlikely (ret)) {objio_free_result (&objios->oir);
fs/nfs/objlayout/objlayout.c +39 -42
165 lines not on this page · raw message
fs/nfs/objlayout/objlayout.h +4 -4
@@ -119,8 +119,8 @@ extern void objio_free_lseg(struct pnfs_layout_segment *lseg);*/ extern void objio_free_result (struct objlayout_io_res *oir); -extern int objio_read_pagelist (struct nfs_pgio_data *rdata); -extern int objio_write_pagelist (struct nfs_pgio_data *wdata,int how); +extern int objio_read_pagelist (struct nfs_pgio_header *rdata); +extern int objio_write_pagelist (struct nfs_pgio_header *wdata,int how);/* * callback API
@@ -168,10 +168,10 @@ extern struct pnfs_layout_segment *objlayout_alloc_lseg(extern void objlayout_free_lseg (struct pnfs_layout_segment *);extern enum pnfs_try_status objlayout_read_pagelist ( -struct nfs_pgio_data *); +struct nfs_pgio_header *);extern enum pnfs_try_status objlayout_write_pagelist ( -struct nfs_pgio_data *, +struct nfs_pgio_header *,int how); extern void objlayout_encode_layoutcommit(
fs/nfs/pagelist.c +56 -61
244 lines not on this page · raw message
fs/nfs/pnfs.c +32 -48
208 lines not on this page · raw message
fs/nfs/pnfs.h +5 -5
@@ -113,8 +113,8 @@ struct pnfs_layoutdriver_type {* Return PNFS_ATTEMPTED to indicate the layout code has attempted * I/O, else return PNFS_NOT_ATTEMPTED to fall back to normal NFS */ -enum pnfs_try_status (*read_pagelist) (struct nfs_pgio_data *nfs_data); -enum pnfs_try_status (*write_pagelist) (struct nfs_pgio_data *nfs_data,int how); +enum pnfs_try_status (*read_pagelist)(struct nfs_pgio_header *); +enum pnfs_try_status (*write_pagelist)(struct nfs_pgio_header *,int );void (*free_deviceid_node) (struct nfs4_deviceid_node *);
@@ -213,13 +213,13 @@ bool pnfs_roc(struct inode *ino);void pnfs_roc_release (struct inode *ino);void pnfs_roc_set_barrier (struct inode *ino,u32 barrier);bool pnfs_roc_drain (struct inode *ino,u32 *barrier,struct rpc_task *task); -void pnfs_set_layoutcommit (struct nfs_pgio_data *wdata); +void pnfs_set_layoutcommit (struct nfs_pgio_header *);void pnfs_cleanup_layoutcommit (struct nfs4_layoutcommit_data *data);int pnfs_layoutcommit_inode (struct inode *inode,bool sync);int _pnfs_return_layout (struct inode *);int pnfs_commit_and_return_layout (struct inode *); -void pnfs_ld_write_done (struct nfs_pgio_data *); -void pnfs_ld_read_done (struct nfs_pgio_data *); +void pnfs_ld_write_done (struct nfs_pgio_header *); +void pnfs_ld_read_done (struct nfs_pgio_header *); struct pnfs_layout_segment *pnfs_update_layout(struct inode *ino, struct nfs_open_context *ctx, loff_t pos,
fs/nfs/proc.c +15 -12
@@ -578,46 +578,49 @@ nfs_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle,return 0 ; } -static int nfs_read_done (struct rpc_task *task,struct nfs_pgio_data *data) +static int nfs_read_done (struct rpc_task *task,struct nfs_pgio_header *hdr) { -struct inode *inode = data->header->inode; +struct inode *inode = hdr->inode;nfs_invalidate_atime (inode);if (task->tk_status >=0 ) { -nfs_refresh_inode (inode, data->res.fattr); +nfs_refresh_inode (inode, hdr->res.fattr);/* Emulate the eof flag, which isn't normally needed in NFSv2 * as it is guaranteed to always return the file attributes */ -if (data->args.offset + data->res.count >= data->res.fattr->size) - data->res.eof =1 ; +if (hdr->args.offset + hdr->res.count >= hdr->res.fattr->size) + hdr->res.eof =1 ; }return 0 ; } -static void nfs_proc_read_setup (struct nfs_pgio_data *data,struct rpc_message *msg) +static void nfs_proc_read_setup (struct nfs_pgio_header *hdr, +struct rpc_message *msg) { msg->rpc_proc = &nfs_procedures[NFSPROC_READ ]; } -static int nfs_proc_pgio_rpc_prepare (struct rpc_task *task,struct nfs_pgio_data *data) +static int nfs_proc_pgio_rpc_prepare (struct rpc_task *task, +struct nfs_pgio_header *hdr) {rpc_call_start (task);return 0 ; } -static int nfs_write_done (struct rpc_task *task,struct nfs_pgio_data *data) +static int nfs_write_done (struct rpc_task *task,struct nfs_pgio_header *hdr) { -struct inode *inode = data->header->inode; +struct inode *inode = hdr->inode;if (task->tk_status >=0 ) -nfs_post_op_update_inode_force_wcc (inode, data->res.fattr); +nfs_post_op_update_inode_force_wcc (inode, hdr->res.fattr);return 0 ; } -static void nfs_proc_write_setup (struct nfs_pgio_data *data,struct rpc_message *msg) +static void nfs_proc_write_setup (struct nfs_pgio_header *hdr, +struct rpc_message *msg) {/* Note: NFSv2 ignores @stable and always uses NFS_FILE_SYNC */ - data->args.stable =NFS_FILE_SYNC ; + hdr->args.stable =NFS_FILE_SYNC ; msg->rpc_proc = &nfs_procedures[NFSPROC_WRITE ]; }
fs/nfs/read.c +22 -20
92 lines not on this page · raw message
fs/nfs/write.c +29 -27
140 lines not on this page · raw message
include/linux/nfs_page.h +5 -4
@@ -64,10 +64,11 @@ struct nfs_rw_ops {const fmode_t rw_mode;struct nfs_pgio_header *(*rw_alloc_header)(void );void (*rw_free_header)(struct nfs_pgio_header *); -void (*rw_release)(struct nfs_pgio_data *); -int (*rw_done)(struct rpc_task *,struct nfs_pgio_data *,struct inode *); -void (*rw_result)(struct rpc_task *,struct nfs_pgio_data *); -void (*rw_initiate)(struct nfs_pgio_data *,struct rpc_message *, +void (*rw_release)(struct nfs_pgio_header *); +int (*rw_done)(struct rpc_task *,struct nfs_pgio_header *, +struct inode *); +void (*rw_result)(struct rpc_task *,struct nfs_pgio_header *); +void (*rw_initiate)(struct nfs_pgio_header *,struct rpc_message *,struct rpc_task_setup *,int ); };
include/linux/nfs_xdr.h +21 -22
65 lines not on this page · raw message
Signature · 1 line
1.8.5.2 (Apple Git-48)
PATCH 4/8 nfs: remove unused writeverf code
In reply to Weston Andros AdamsonRemove duplicate writeverf structure from merge of nfs_pgio_header and nfs_pgio_data and remove writeverf related flags and logic to handle more than one RPC per nfs_pgio_header.
Signed-off-by Weston Andros Adamson <[email protected]>
--- fs/nfs/blocklayout/blocklayout.c | 2 +- fs/nfs/direct.c | 25 ++++++++----------------- fs/nfs/internal.h | 1 + fs/nfs/objlayout/objlayout.c | 4 ++-- fs/nfs/pagelist.c | 2 +- fs/nfs/write.c | 27 +++++---------------------- include/linux/nfs_xdr.h | 3 --- 7 files changed, 18 insertions(+), 46 deletions(-)
fs/nfs/blocklayout/blocklayout.c +1 -1
@@ -445,7 +445,7 @@ static void bl_end_par_io_write(void *data, int num_se) } hdr->task.tk_status = hdr->pnfs_error; - hdr->writeverf.committed =NFS_FILE_SYNC ; + hdr->verf.committed =NFS_FILE_SYNC ;INIT_WORK (&hdr->task.u.tk_work, bl_write_cleanup);schedule_work (&hdr->task.u.tk_work); }
fs/nfs/direct.c +8 -17
@@ -878,7 +878,7 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr) {struct nfs_direct_req *dreq = hdr->dreq;struct nfs_commit_info cinfo; -int bit =-1 ; +bool request_commit = false;struct nfs_page *req =nfs_list_entry (hdr->pages.next);if (test_bit (NFS_IOHDR_REDO , &hdr->flags))
@@ -892,27 +892,20 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr) dreq->flags =0 ; dreq->error = hdr->error; } -if (dreq->error !=0 ) - bit =NFS_IOHDR_ERROR ; -else { +if (dreq->error ==0 ) { dreq->count += hdr->good_bytes; -if (test_bit (NFS_IOHDR_NEED_RESCHED , &hdr->flags)) { - dreq->flags =NFS_ODIRECT_RESCHED_WRITES ; - bit =NFS_IOHDR_NEED_RESCHED ; - }else if (test_bit (NFS_IOHDR_NEED_COMMIT , &hdr->flags)) { +if (nfs_write_need_commit (hdr)) {if (dreq->flags ==NFS_ODIRECT_RESCHED_WRITES ) - bit =NFS_IOHDR_NEED_RESCHED ; + request_commit = true;else if (dreq->flags ==0 ) {nfs_direct_set_hdr_verf (dreq, hdr); - bit =NFS_IOHDR_NEED_COMMIT ; + request_commit = true; dreq->flags =NFS_ODIRECT_DO_COMMIT ; }else if (dreq->flags ==NFS_ODIRECT_DO_COMMIT ) { -if (nfs_direct_set_or_cmp_hdr_verf (dreq, hdr)) { + request_commit = true; +if (nfs_direct_set_or_cmp_hdr_verf (dreq, hdr)) dreq->flags =NFS_ODIRECT_RESCHED_WRITES ; - bit =NFS_IOHDR_NEED_RESCHED ; - }else - bit =NFS_IOHDR_NEED_COMMIT ; } } }
@@ -923,9 +916,7 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr) req =nfs_list_entry (hdr->pages.next);nfs_list_remove_request (req); -switch (bit) { -case NFS_IOHDR_NEED_RESCHED : -case NFS_IOHDR_NEED_COMMIT : +if (request_commit) {kref_get (&req->wb_kref);nfs_mark_request_commit (req, hdr->lseg, &cinfo); do_destroy = false;
fs/nfs/internal.h +1 -0
@@ -443,6 +443,7 @@ int nfs_scan_commit(struct inode *inode, struct list_head *dst,void nfs_mark_request_commit (struct nfs_page *req,struct pnfs_layout_segment *lseg,struct nfs_commit_info *cinfo); +int nfs_write_need_commit (struct nfs_pgio_header *);int nfs_generic_commit_list (struct inode *inode,struct list_head *head,int how,struct nfs_commit_info *cinfo); void nfs_retry_commit(struct list_head *page_list,
fs/nfs/objlayout/objlayout.c +2 -2
@@ -328,7 +328,7 @@ objlayout_write_done(struct objlayout_io_res *oir, ssize_t status, bool sync) oir->status = hdr->task.tk_status = status;if (status >=0 ) { hdr->res.count = status; - hdr->writeverf.committed = oir->committed; + hdr->verf.committed = oir->committed; }else { hdr->pnfs_error = status; }
@@ -336,7 +336,7 @@ objlayout_write_done(struct objlayout_io_res *oir, ssize_t status, bool sync)/* must not use oir after this point */ dprintk ("%s: Return status %zd committed %d sync=%d\n" , __func__, - status, hdr->writeverf.committed, sync); + status, hdr->verf.committed, sync);if (sync)pnfs_ld_write_done (hdr);
fs/nfs/pagelist.c +1 -1
@@ -546,7 +546,7 @@ static void nfs_pgio_rpcsetup(struct nfs_pgio_header *hdr, hdr->res.fattr = &hdr->fattr; hdr->res.count = count; hdr->res.eof =0 ; - hdr->res.verf = &hdr->writeverf; + hdr->res.verf = &hdr->verf;nfs_fattr_init (&hdr->fattr); }
fs/nfs/write.c +5 -22
@@ -595,12 +595,11 @@ nfs_clear_request_commit(struct nfs_page *req) } } -static inline int nfs_write_need_commit (struct nfs_pgio_header *hdr) { -if (hdr->writeverf.committed ==NFS_DATA_SYNC ) +if (hdr->verf.committed ==NFS_DATA_SYNC )return hdr->lseg ==NULL ; -return hdr->writeverf.committed !=NFS_FILE_SYNC ; +return hdr->verf.committed !=NFS_FILE_SYNC ; }#else
@@ -626,7 +625,6 @@ nfs_clear_request_commit(struct nfs_page *req) { } -static inline int nfs_write_need_commit (struct nfs_pgio_header *hdr) {return 0 ;
@@ -654,11 +652,7 @@ static void nfs_write_completion(struct nfs_pgio_header *hdr)nfs_context_set_write_error (req->wb_context, hdr->error); goto remove_req; } -if (test_bit (NFS_IOHDR_NEED_RESCHED , &hdr->flags)) { -nfs_mark_request_dirty (req); - goto next; - } -if (test_bit (NFS_IOHDR_NEED_COMMIT , &hdr->flags)) { +if (nfs_write_need_commit (hdr)) {memcpy (&req->wb_verf, &hdr->verf.verifier,sizeof (req->wb_verf));nfs_mark_request_commit (req, hdr->lseg, &cinfo); goto next;
@@ -668,7 +662,7 @@ remove_req: next:nfs_unlock_request (req);nfs_end_page_writeback (req); - do_destroy = !test_bit (NFS_IOHDR_NEED_COMMIT , &hdr->flags); + do_destroy = !nfs_write_need_commit (hdr);nfs_release_request (req); } out:
@@ -1086,18 +1080,7 @@ void nfs_commit_prepare(struct rpc_task *task, void *calldata)static void nfs_writeback_release_common (struct nfs_pgio_header *hdr) { -int status = hdr->task.tk_status; - -if ((status >=0 ) &&nfs_write_need_commit (hdr)) { -spin_lock (&hdr->lock); -if (test_bit (NFS_IOHDR_NEED_RESCHED , &hdr->flags)) - ;/* Do nothing */ -else if (!test_and_set_bit (NFS_IOHDR_NEED_COMMIT , &hdr->flags)) -memcpy (&hdr->verf, &hdr->writeverf,sizeof (hdr->verf)); -else if (memcmp (&hdr->verf, &hdr->writeverf,sizeof (hdr->verf))) -set_bit (NFS_IOHDR_NEED_RESCHED , &hdr->flags); -spin_unlock (&hdr->lock); - } +/* do nothing! */ }/*
include/linux/nfs_xdr.h +0 -3
@@ -1253,8 +1253,6 @@ enum {NFS_IOHDR_ERROR =0 ,NFS_IOHDR_EOF , NFS_IOHDR_REDO, -NFS_IOHDR_NEED_COMMIT , - NFS_IOHDR_NEED_RESCHED, }; struct nfs_pgio_header {
@@ -1284,7 +1282,6 @@ struct nfs_pgio_header {*/ struct rpc_task task;struct nfs_fattr fattr; -struct nfs_writeverf writeverf;/* Used for writes */ struct nfs_pgio_args args;/* argument struct */ struct nfs_pgio_res res;/* result struct */ unsigned long timestamp;/* For lease renewal */
Signature · 1 line
1.8.5.2 (Apple Git-48)
PATCH 5/8 nfs: remove pgio_header refcount, related cleanup
In reply to Weston Andros AdamsonThe refcounting on nfs_pgio_header was related to there being (possibly) more than one nfs_pgio_data. Now that nfs_pgio_data has been merged into nfs_pgio_header, there is no reason to do this ref counting. Just call the completion callback on nfs_pgio_release/nfs_pgio_error.
Signed-off-by Weston Andros Adamson <[email protected]>
--- fs/nfs/internal.h | 2 +- fs/nfs/pagelist.c | 61 +++++++++++++++++++------------------------------ fs/nfs/pnfs.c | 10 ++------ include/linux/nfs_xdr.h | 1 - 4 files changed, 27 insertions(+), 47 deletions(-)
fs/nfs/internal.h +1 -1
@@ -240,8 +240,8 @@ int nfs_iocounter_wait(struct nfs_io_counter *c);extern const struct nfs_pageio_ops nfs_pgio_rw_ops;struct nfs_pgio_header *nfs_pgio_header_alloc (const struct nfs_rw_ops *);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 *); +void nfs_generic_pgio_reset (struct nfs_pgio_header *);int nfs_initiate_pgio (struct rpc_clnt *,struct nfs_pgio_header *,const struct rpc_call_ops *,int ,int );
fs/nfs/pagelist.c +24 -37
109 lines not on this page · raw message
fs/nfs/pnfs.c +2 -8
@@ -1537,7 +1537,7 @@ pnfs_write_through_mds(struct nfs_pageio_descriptor *desc,nfs_pageio_reset_write_mds (desc); desc->pg_recoalesce =1 ; } -nfs_pgio_data_destroy (hdr); +nfs_generic_pgio_reset (hdr); } static enum pnfs_try_status
@@ -1598,15 +1598,12 @@ pnfs_generic_pg_writepages(struct nfs_pageio_descriptor *desc) }nfs_pgheader_init (desc, hdr, pnfs_writehdr_free); hdr->lseg =pnfs_get_lseg (desc->pg_lseg); -atomic_inc (&hdr->refcnt); ret =nfs_generic_pgio (desc, hdr);if (ret !=0 ) {pnfs_put_lseg (desc->pg_lseg); desc->pg_lseg =NULL ; }else pnfs_do_write (desc, hdr, desc->pg_ioflags); -if (atomic_dec_and_test (&hdr->refcnt)) - hdr->completion_ops->completion (hdr);return ret; }EXPORT_SYMBOL_GPL (pnfs_generic_pg_writepages);
@@ -1677,7 +1674,7 @@ pnfs_read_through_mds(struct nfs_pageio_descriptor *desc,nfs_pageio_reset_read_mds (desc); desc->pg_recoalesce =1 ; } -nfs_pgio_data_destroy (hdr); +nfs_generic_pgio_reset (hdr); }/*
@@ -1741,15 +1738,12 @@ pnfs_generic_pg_readpages(struct nfs_pageio_descriptor *desc) }nfs_pgheader_init (desc, hdr, pnfs_readhdr_free); hdr->lseg =pnfs_get_lseg (desc->pg_lseg); -atomic_inc (&hdr->refcnt); ret =nfs_generic_pgio (desc, hdr);if (ret !=0 ) {pnfs_put_lseg (desc->pg_lseg); desc->pg_lseg =NULL ; }else pnfs_do_read (desc, hdr); -if (atomic_dec_and_test (&hdr->refcnt)) - hdr->completion_ops->completion (hdr);return ret; }EXPORT_SYMBOL_GPL (pnfs_generic_pg_readpages);
include/linux/nfs_xdr.h +0 -1
@@ -1259,7 +1259,6 @@ struct nfs_pgio_header {struct inode *inode;struct rpc_cred *cred;struct list_head pages; -atomic_t refcnt;struct nfs_page *req;struct nfs_writeverf verf;/* Used for writes */ struct pnfs_layout_segment *lseg;
Signature · 1 line
1.8.5.2 (Apple Git-48)
PATCH 6/8 pnfs: clean up *_resend_to_mds
In reply to Weston Andros AdamsonClean up pnfs_read_done_resend_to_mds and pnfs_write_done_resend_to_mds:
- instead of passing all arguments from a nfs_pgio_header, just pass the header
- share the common code
Signed-off-by Weston Andros Adamson <[email protected]>
--- fs/nfs/nfs4filelayout.c | 10 ++------ fs/nfs/pagelist.c | 32 +++++++++++++++++++++++++ fs/nfs/pnfs.c | 62 +++++++----------------------------------------- fs/nfs/pnfs.h | 8 ++----- include/linux/nfs_page.h | 2 ++ 5 files changed, 47 insertions(+), 67 deletions(-)
fs/nfs/nfs4filelayout.c +2 -8
@@ -97,10 +97,7 @@ static void filelayout_reset_write(struct nfs_pgio_header *hdr) hdr->args.count, (unsigned long long)hdr->args.offset); - task->tk_status =pnfs_write_done_resend_to_mds (hdr->inode, - &hdr->pages, - hdr->completion_ops, - hdr->dreq); + task->tk_status =pnfs_write_done_resend_to_mds (hdr); } }
@@ -117,10 +114,7 @@ static void filelayout_reset_read(struct nfs_pgio_header *hdr) hdr->args.count, (unsigned long long)hdr->args.offset); - task->tk_status =pnfs_read_done_resend_to_mds (hdr->inode, - &hdr->pages, - hdr->completion_ops, - hdr->dreq); + task->tk_status =pnfs_read_done_resend_to_mds (hdr); } }
fs/nfs/pagelist.c +32 -0
@@ -945,6 +945,38 @@ int nfs_pageio_add_request(struct nfs_pageio_descriptor *desc, }EXPORT_SYMBOL_GPL (nfs_pageio_add_request); +/* +* nfs_pageio_resend - Transfer requests to new descriptor and resend +* @hdr - the pgio header to move request from +* @desc - the pageio descriptor to add requests to +* +* Try to move each request (nfs_page) from @hdr to @desc then attempt +* to send them. +* +* Returns 0 on success and < 0 on error. +*/ +int nfs_pageio_resend (struct nfs_pageio_descriptor *desc, +struct nfs_pgio_header *hdr) +{ +LIST_HEAD (failed); + + desc->pg_dreq = hdr->dreq; +while (!list_empty (&hdr->pages)) { +struct nfs_page *req =nfs_list_entry (hdr->pages.next); + +nfs_list_remove_request (req); +if (!nfs_pageio_add_request (desc, req)) +nfs_list_add_request (req, &failed); + } +nfs_pageio_complete (desc); +if (!list_empty (&failed)) { +list_move (&failed, &hdr->pages); +return -EIO ; + } +return 0 ; +} +EXPORT_SYMBOL_GPL (nfs_pageio_resend); +/** * nfs_pageio_complete - Complete I/O on an nfs_pageio_descriptor * @desc: pointer to io descriptor
fs/nfs/pnfs.c +9 -53
94 lines not on this page · raw message
fs/nfs/pnfs.h +2 -6
@@ -228,12 +228,8 @@ struct pnfs_layout_segment *pnfs_update_layout(struct inode *ino, gfp_t gfp_flags);void nfs4_deviceid_mark_client_invalid (struct nfs_client *clp); -int pnfs_read_done_resend_to_mds (struct inode *inode,struct list_head *head, -const struct nfs_pgio_completion_ops *compl_ops, -struct nfs_direct_req *dreq); -int pnfs_write_done_resend_to_mds (struct inode *inode,struct list_head *head, -const struct nfs_pgio_completion_ops *compl_ops, -struct nfs_direct_req *dreq); +int pnfs_read_done_resend_to_mds (struct nfs_pgio_header *); +int pnfs_write_done_resend_to_mds (struct nfs_pgio_header *);struct nfs4_threshold *pnfs_mdsthreshold_alloc (void );/* nfs4_deviceid_flags */
include/linux/nfs_page.h +2 -0
@@ -112,6 +112,8 @@ extern void nfs_pageio_init(struct nfs_pageio_descriptor *desc, int how);extern int nfs_pageio_add_request (struct nfs_pageio_descriptor *,struct nfs_page *); +extern int nfs_pageio_resend (struct nfs_pageio_descriptor *, +struct nfs_pgio_header *);extern void nfs_pageio_complete (struct nfs_pageio_descriptor *desc);extern void nfs_pageio_cond_complete (struct nfs_pageio_descriptor *,pgoff_t ); extern size_t nfs_generic_pg_test(struct nfs_pageio_descriptor *desc,
Signature · 1 line
1.8.5.2 (Apple Git-48)
Re: [PATCH 6/8] pnfs: clean up *_resend_to_mds
fs/nfs/pagelist.c int nfs_pageio_add_request(struct nfs_pageio_descriptor *desc, · line 971
Quoted 9 lines
fs/nfs/pagelist.c +9
-0+ desc->pg_dreq = hdr->dreq; +while (!list_empty (&hdr->pages)) { +struct nfs_page *req =nfs_list_entry (hdr->pages.next); + +nfs_list_remove_request (req); +if (!nfs_pageio_add_request (desc, req)) +nfs_list_add_request (req, &failed); + } +nfs_pageio_complete (desc);
I think you can also drop the export for nfs_pageio_complete now.
Re: [PATCH 6/8] pnfs: clean up *_resend_to_mds
In reply to Weston Andros AdamsonQuoted 163 lines · Weston Andros Adamson
Clean up
pnfs_read_done_resend_to_mdsandpnfs_write_done_resend_to_mds:
- instead of passing all arguments from anfs_pgio_header, just pass the header
- share the common codeSigned-off-by Weston Andros Adamson <[email protected]>--- fs/nfs/nfs4filelayout.c | 10 ++------ fs/nfs/pagelist.c | 32 +++++++++++++++++++++++++ fs/nfs/pnfs.c | 62 +++++++----------------------------------------- fs/nfs/pnfs.h | 8 ++----- include/linux/nfs_page.h | 2 ++ 5 files changed, 47 insertions(+), 67 deletions(-)fs/nfs/nfs4filelayout.c +2
-8@@ -97,10 +97,7 @@ static void filelayout_reset_write(struct nfs_pgio_header *hdr) hdr->args.count, (unsigned long long)hdr->args.offset); - task->tk_status =pnfs_write_done_resend_to_mds (hdr->inode, - &hdr->pages, - hdr->completion_ops, - hdr->dreq); + task->tk_status =pnfs_write_done_resend_to_mds (hdr); } }@@ -117,10 +114,7 @@ static void filelayout_reset_read(struct nfs_pgio_header *hdr) hdr->args.count, (unsigned long long)hdr->args.offset); - task->tk_status =pnfs_read_done_resend_to_mds (hdr->inode, - &hdr->pages, - hdr->completion_ops, - hdr->dreq); + task->tk_status =pnfs_read_done_resend_to_mds (hdr); } }fs/nfs/pagelist.c +32
-0@@ -945,6 +945,38 @@ int nfs_pageio_add_request(struct nfs_pageio_descriptor *desc, }EXPORT_SYMBOL_GPL (nfs_pageio_add_request); +/* +* nfs_pageio_resend - Transfer requests to new descriptor and resend +* @hdr - the pgio header to move request from +* @desc - the pageio descriptor to add requests to +* +* Try to move each request (nfs_page) from @hdr to @desc then attempt +* to send them. +* +* Returns 0 on success and < 0 on error. +*/ +int nfs_pageio_resend (struct nfs_pageio_descriptor *desc, +struct nfs_pgio_header *hdr) +{ +LIST_HEAD (failed); + + desc->pg_dreq = hdr->dreq; +while (!list_empty (&hdr->pages)) { +struct nfs_page *req =nfs_list_entry (hdr->pages.next); + +nfs_list_remove_request (req); +if (!nfs_pageio_add_request (desc, req)) +nfs_list_add_request (req, &failed); + } +nfs_pageio_complete (desc); +if (!list_empty (&failed)) { +list_move (&failed, &hdr->pages); +return -EIO ; + } +return 0 ; +} +EXPORT_SYMBOL_GPL (nfs_pageio_resend); +/** * nfs_pageio_complete - Complete I/O on an nfs_pageio_descriptor * @desc: pointer to io descriptor fs/nfs/pnfs.c +6
-43@@ -1466,35 +1466,14 @@ pnfs_generic_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, }EXPORT_SYMBOL_GPL (pnfs_generic_pg_test); -int pnfs_write_done_resend_to_mds (struct inode *inode, -struct list_head *head, -const struct nfs_pgio_completion_ops *compl_ops, -struct nfs_direct_req *dreq) +int pnfs_write_done_resend_to_mds (struct nfs_pgio_header *hdr) {struct nfs_pageio_descriptor pgio; -LIST_HEAD (failed);/* Resend all requests through the MDS */ -nfs_pageio_init_write (&pgio, inode,FLUSH_STABLE , true, compl_ops); - pgio.pg_dreq = dreq; -while (!list_empty (head)) { -struct nfs_page *req =nfs_list_entry (head->next); - -nfs_list_remove_request (req); -if (!nfs_pageio_add_request (&pgio, req)) -nfs_list_add_request (req, &failed); - } -nfs_pageio_complete (&pgio); - -if (!list_empty (&failed)) { -/* For some reason our attempt to resend pages. Mark the -* overall send request as having failed, and let -* nfs_writeback_release_full deal with the error. -*/ -list_move (&failed, head); -return -EIO ; - } -return 0 ; +nfs_pageio_init_write (&pgio, hdr->inode,FLUSH_STABLE , true, + hdr->completion_ops); +return nfs_pageio_resend (&pgio, hdr); }EXPORT_SYMBOL_GPL (pnfs_write_done_resend_to_mds);@@ -1507,10 +1486,7 @@ static void pnfs_ld_handle_write_error(struct nfs_pgio_header *hdr)pnfs_return_layout (hdr->inode); }if (!test_and_set_bit (NFS_IOHDR_REDO , &hdr->flags)) - hdr->task.tk_status =pnfs_write_done_resend_to_mds (hdr->inode, - &hdr->pages, - hdr->completion_ops, - hdr->dreq); + hdr->task.tk_status =pnfs_write_done_resend_to_mds (hdr); }/* @@ -1608,30 +1584,13 @@ pnfs_generic_pg_writepages(struct nfs_pageio_descriptor *desc) }EXPORT_SYMBOL_GPL (pnfs_generic_pg_writepages); -int pnfs_read_done_resend_to_mds (struct inode *inode, -struct list_head *head, -const struct nfs_pgio_completion_ops *compl_ops, -struct nfs_direct_req *dreq) +int pnfs_read_done_resend_to_mds (struct nfs_pgio_header *hdr) {struct nfs_pageio_descriptor pgio; -LIST_HEAD (failed);/* Resend all requests through the MDS */ -nfs_pageio_init_read (&pgio, inode, true, compl_ops); - pgio.pg_dreq = dreq; -while (!list_empty (head)) { -struct nfs_page *req =nfs_list_entry (head->next); - -nfs_list_remove_request (req); -if (!nfs_pageio_add_request (&pgio, req)) -nfs_list_add_request (req, &failed); - }
fs/nfs/pnfs.c pnfs_generic_pg_writepages(struct nfs_pageio_descriptor *desc) · line 1595
Quoted 10 lines
fs/nfs/pnfs.c +2
-6-nfs_pageio_complete (&pgio); - -if (!list_empty (&failed)) { -list_move (&failed, head); -return -EIO ; - } +nfs_pageio_init_read (&pgio, hdr->inode, true, hdr->completion_ops); +nfs_pageio_resend (&pgio, hdr);return 0 ; }
Write returns the value of nfs_pageio_resend(). Why does read always return 0?
Anna
Quoted 45 lines
fs/nfs/pnfs.c +1
-4EXPORT_SYMBOL_GPL (pnfs_read_done_resend_to_mds);@@ -1644,10 +1603,7 @@ static void pnfs_ld_handle_read_error(struct nfs_pgio_header *hdr)pnfs_return_layout (hdr->inode); }if (!test_and_set_bit (NFS_IOHDR_REDO , &hdr->flags)) - hdr->task.tk_status =pnfs_read_done_resend_to_mds (hdr->inode, - &hdr->pages, - hdr->completion_ops, - hdr->dreq); + hdr->task.tk_status =pnfs_read_done_resend_to_mds (hdr); }/* fs/nfs/pnfs.h +2
-6@@ -228,12 +228,8 @@ struct pnfs_layout_segment *pnfs_update_layout(struct inode *ino, gfp_t gfp_flags);void nfs4_deviceid_mark_client_invalid (struct nfs_client *clp); -int pnfs_read_done_resend_to_mds (struct inode *inode,struct list_head *head, -const struct nfs_pgio_completion_ops *compl_ops, -struct nfs_direct_req *dreq); -int pnfs_write_done_resend_to_mds (struct inode *inode,struct list_head *head, -const struct nfs_pgio_completion_ops *compl_ops, -struct nfs_direct_req *dreq); +int pnfs_read_done_resend_to_mds (struct nfs_pgio_header *); +int pnfs_write_done_resend_to_mds (struct nfs_pgio_header *);struct nfs4_threshold *pnfs_mdsthreshold_alloc (void );/* nfs4_deviceid_flags */ include/linux/nfs_page.h +2
-0@@ -112,6 +112,8 @@ extern void nfs_pageio_init(struct nfs_pageio_descriptor *desc, int how);extern int nfs_pageio_add_request (struct nfs_pageio_descriptor *,struct nfs_page *); +extern int nfs_pageio_resend (struct nfs_pageio_descriptor *, +struct nfs_pgio_header *);extern void nfs_pageio_complete (struct nfs_pageio_descriptor *desc);extern void nfs_pageio_cond_complete (struct nfs_pageio_descriptor *,pgoff_t ); extern size_t nfs_generic_pg_test(struct nfs_pageio_descriptor *desc,
Re: [PATCH 6/8] pnfs: clean up *_resend_to_mds
Quoted 177 lines · Anna Schumaker
Quoted 163 lines · Weston Andros Adamson
Clean up
pnfs_read_done_resend_to_mdsandpnfs_write_done_resend_to_mds:
- instead of passing all arguments from anfs_pgio_header, just pass the header
- share the common codeSigned-off-by Weston Andros Adamson <[email protected]>---
fs/nfs/nfs4filelayout.c | 10 ++------ fs/nfs/pagelist.c | 32 +++++++++++++++++++++++++ fs/nfs/pnfs.c | 62 +++++++----------------------------------------- fs/nfs/pnfs.h | 8 ++----- include/linux/nfs_page.h | 2 ++ 5 files changed, 47 insertions(+), 67 deletions(-)fs/nfs/nfs4filelayout.c +2
-8@@ -97,10 +97,7 @@ static void filelayout_reset_write(struct nfs_pgio_header *hdr) hdr->args.count, (unsigned long long)hdr->args.offset); - task->tk_status =pnfs_write_done_resend_to_mds (hdr->inode, - &hdr->pages, - hdr->completion_ops, - hdr->dreq); + task->tk_status =pnfs_write_done_resend_to_mds (hdr); } }@@ -117,10 +114,7 @@ static void filelayout_reset_read(struct nfs_pgio_header *hdr) hdr->args.count, (unsigned long long)hdr->args.offset); - task->tk_status =pnfs_read_done_resend_to_mds (hdr->inode, - &hdr->pages, - hdr->completion_ops, - hdr->dreq); + task->tk_status =pnfs_read_done_resend_to_mds (hdr); } }fs/nfs/pagelist.c +32
-0@@ -945,6 +945,38 @@ int nfs_pageio_add_request(struct nfs_pageio_descriptor *desc, }EXPORT_SYMBOL_GPL (nfs_pageio_add_request); +/* +* nfs_pageio_resend - Transfer requests to new descriptor and resend +* @hdr - the pgio header to move request from +* @desc - the pageio descriptor to add requests to +* +* Try to move each request (nfs_page) from @hdr to @desc then attempt +* to send them. +* +* Returns 0 on success and < 0 on error. +*/ +int nfs_pageio_resend (struct nfs_pageio_descriptor *desc, +struct nfs_pgio_header *hdr) +{ +LIST_HEAD (failed); + + desc->pg_dreq = hdr->dreq; +while (!list_empty (&hdr->pages)) { +struct nfs_page *req =nfs_list_entry (hdr->pages.next); + +nfs_list_remove_request (req); +if (!nfs_pageio_add_request (desc, req)) +nfs_list_add_request (req, &failed); + } +nfs_pageio_complete (desc); +if (!list_empty (&failed)) { +list_move (&failed, &hdr->pages); +return -EIO ; + } +return 0 ; +} +EXPORT_SYMBOL_GPL (nfs_pageio_resend); +/** * nfs_pageio_complete - Complete I/O on an nfs_pageio_descriptor * @desc: pointer to io descriptor fs/nfs/pnfs.c +6
-43@@ -1466,35 +1466,14 @@ pnfs_generic_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, }EXPORT_SYMBOL_GPL (pnfs_generic_pg_test); -int pnfs_write_done_resend_to_mds (struct inode *inode, -struct list_head *head, -const struct nfs_pgio_completion_ops *compl_ops, -struct nfs_direct_req *dreq) +int pnfs_write_done_resend_to_mds (struct nfs_pgio_header *hdr) {struct nfs_pageio_descriptor pgio; -LIST_HEAD (failed);/* Resend all requests through the MDS */ -nfs_pageio_init_write (&pgio, inode,FLUSH_STABLE , true, compl_ops); - pgio.pg_dreq = dreq; -while (!list_empty (head)) { -struct nfs_page *req =nfs_list_entry (head->next); - -nfs_list_remove_request (req); -if (!nfs_pageio_add_request (&pgio, req)) -nfs_list_add_request (req, &failed); - } -nfs_pageio_complete (&pgio); - -if (!list_empty (&failed)) { -/* For some reason our attempt to resend pages. Mark the -* overall send request as having failed, and let -* nfs_writeback_release_full deal with the error. -*/ -list_move (&failed, head); -return -EIO ; - } -return 0 ; +nfs_pageio_init_write (&pgio, hdr->inode,FLUSH_STABLE , true, + hdr->completion_ops); +return nfs_pageio_resend (&pgio, hdr); }EXPORT_SYMBOL_GPL (pnfs_write_done_resend_to_mds);@@ -1507,10 +1486,7 @@ static void pnfs_ld_handle_write_error(struct nfs_pgio_header *hdr)pnfs_return_layout (hdr->inode); }if (!test_and_set_bit (NFS_IOHDR_REDO , &hdr->flags)) - hdr->task.tk_status =pnfs_write_done_resend_to_mds (hdr->inode, - &hdr->pages, - hdr->completion_ops, - hdr->dreq); + hdr->task.tk_status =pnfs_write_done_resend_to_mds (hdr); }/* @@ -1608,30 +1584,13 @@ pnfs_generic_pg_writepages(struct nfs_pageio_descriptor *desc) }EXPORT_SYMBOL_GPL (pnfs_generic_pg_writepages); -int pnfs_read_done_resend_to_mds (struct inode *inode, -struct list_head *head, -const struct nfs_pgio_completion_ops *compl_ops, -struct nfs_direct_req *dreq) +int pnfs_read_done_resend_to_mds (struct nfs_pgio_header *hdr) {struct nfs_pageio_descriptor pgio; -LIST_HEAD (failed);/* Resend all requests through the MDS */ -nfs_pageio_init_read (&pgio, inode, true, compl_ops); - pgio.pg_dreq = dreq; -while (!list_empty (head)) { -struct nfs_page *req =nfs_list_entry (head->next); - -nfs_list_remove_request (req); -if (!nfs_pageio_add_request (&pgio, req)) -nfs_list_add_request (req, &failed); - }fs/nfs/pnfs.c pnfs_generic_pg_writepages(struct nfs_pageio_descriptor *desc) · line 1595
Quoted 10 lines
fs/nfs/pnfs.c +2
-6-nfs_pageio_complete (&pgio); - -if (!list_empty (&failed)) { -list_move (&failed, head); -return -EIO ; - } +nfs_pageio_init_read (&pgio, hdr->inode, true, hdr->completion_ops); +nfs_pageio_resend (&pgio, hdr);return 0 ; }Write returns the value of
nfs_pageio_resend(). Why does read always return 0?
Quoted 1 line
Anna
Good catch! Thanks!
-dros
Quoted 46 lines
Quoted 45 lines
fs/nfs/pnfs.c +1
-4EXPORT_SYMBOL_GPL (pnfs_read_done_resend_to_mds);@@ -1644,10 +1603,7 @@ static void pnfs_ld_handle_read_error(struct nfs_pgio_header *hdr)pnfs_return_layout (hdr->inode); }if (!test_and_set_bit (NFS_IOHDR_REDO , &hdr->flags)) - hdr->task.tk_status =pnfs_read_done_resend_to_mds (hdr->inode, - &hdr->pages, - hdr->completion_ops, - hdr->dreq); + hdr->task.tk_status =pnfs_read_done_resend_to_mds (hdr); }/* fs/nfs/pnfs.h +2
-6@@ -228,12 +228,8 @@ struct pnfs_layout_segment *pnfs_update_layout(struct inode *ino, gfp_t gfp_flags);void nfs4_deviceid_mark_client_invalid (struct nfs_client *clp); -int pnfs_read_done_resend_to_mds (struct inode *inode,struct list_head *head, -const struct nfs_pgio_completion_ops *compl_ops, -struct nfs_direct_req *dreq); -int pnfs_write_done_resend_to_mds (struct inode *inode,struct list_head *head, -const struct nfs_pgio_completion_ops *compl_ops, -struct nfs_direct_req *dreq); +int pnfs_read_done_resend_to_mds (struct nfs_pgio_header *); +int pnfs_write_done_resend_to_mds (struct nfs_pgio_header *);struct nfs4_threshold *pnfs_mdsthreshold_alloc (void );/* nfs4_deviceid_flags */ include/linux/nfs_page.h +2
-0@@ -112,6 +112,8 @@ extern void nfs_pageio_init(struct nfs_pageio_descriptor *desc, int how);extern int nfs_pageio_add_request (struct nfs_pageio_descriptor *,struct nfs_page *); +extern int nfs_pageio_resend (struct nfs_pageio_descriptor *, +struct nfs_pgio_header *);extern void nfs_pageio_complete (struct nfs_pageio_descriptor *desc);extern void nfs_pageio_cond_complete (struct nfs_pageio_descriptor *,pgoff_t ); extern size_t nfs_generic_pg_test(struct nfs_pageio_descriptor *desc,
PATCH 7/8 nfs: clean up function decls in nfs_page.h
In reply to Weston Andros AdamsonFor consistency, remove argument names in function declarations
Signed-off-by Weston Andros Adamson <[email protected]>
--- include/linux/nfs_page.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
include/linux/nfs_page.h +17 -17
@@ -95,32 +95,32 @@ struct nfs_pageio_descriptor {#define NFS_WBACK_BUSY (req) (test_bit(PG_BUSY,&(req)->wb_flags)) -extern struct nfs_page *nfs_create_request (struct nfs_open_context *ctx, -struct page *page, -struct nfs_page *last, -unsigned int offset, -unsigned int count); +extern struct nfs_page *nfs_create_request (struct nfs_open_context *, +struct page *, +struct nfs_page *, +unsigned int , +unsigned int );extern void nfs_release_request (struct nfs_page *); -extern void nfs_pageio_init (struct nfs_pageio_descriptor *desc, -struct inode *inode, -const struct nfs_pageio_ops *pg_ops, -const struct nfs_pgio_completion_ops *compl_ops, -const struct nfs_rw_ops *rw_ops, -size_t bsize, -int how); +extern void nfs_pageio_init (struct nfs_pageio_descriptor *, +struct inode *, +const struct nfs_pageio_ops *, +const struct nfs_pgio_completion_ops *, +const struct nfs_rw_ops *, +size_t , +int );extern int nfs_pageio_add_request (struct nfs_pageio_descriptor *,struct nfs_page *);extern int nfs_pageio_resend (struct nfs_pageio_descriptor *,struct nfs_pgio_header *); -extern void nfs_pageio_complete (struct nfs_pageio_descriptor *desc); +extern void nfs_pageio_complete (struct nfs_pageio_descriptor *);extern void nfs_pageio_cond_complete (struct nfs_pageio_descriptor *,pgoff_t ); -extern size_t nfs_generic_pg_test (struct nfs_pageio_descriptor *desc, -struct nfs_page *prev, -struct nfs_page *req); +extern size_t nfs_generic_pg_test (struct nfs_pageio_descriptor *, +struct nfs_page *, +struct nfs_page *);extern int nfs_wait_on_request (struct nfs_page *); -extern void nfs_unlock_request (struct nfs_page *req); +extern void nfs_unlock_request (struct nfs_page *);extern void nfs_unlock_and_release_request (struct nfs_page *);extern void nfs_page_group_lock (struct nfs_page *);extern void nfs_page_group_unlock (struct nfs_page *);
Signature · 1 line
1.8.5.2 (Apple Git-48)
Re: [PATCH 7/8] nfs: clean up function decls in nfs_page.h
Weston Andros Adamson wrote:
For consistency, remove argument names in function declarations
This conflicts with the style guide:
Chapter 6: Functions
In function prototypes, include parameter names with their data types. Although this is not required by the C language, it is preferred in Linux because it is a simple way to add valuable information for the reader.
Re: [PATCH 7/8] nfs: clean up function decls in nfs_page.h
Quoted 5 lines · Jim Rees
Weston Andros Adamson wrote:
For consistency, remove argument names in function declarations
This conflicts with the style guide:
Well, then so do many (most?) function declarations in nfs-land.
Quoted 6 lines
Chapter 6: Functions
In function prototypes, include parameter names with their data types. Although this is not required by the C language, it is preferred in Linux because it is a simple way to add valuable information for the reader.
I personally disagree that function names provide “valuable information”. “struct page *page” -> “oh, it’s a page!” ;)
I can just drop this patch if people don’t like it...
-dros
Re: [PATCH 7/8] nfs: clean up function decls in nfs_page.h
Consistency often trumps style guidelines, and I have no strong objection to this change. Just wanted to point it out.
Re: [PATCH 7/8] nfs: clean up function decls in nfs_page.h
Quoted 2 lines · Jim Rees
Consistency often trumps style guidelines, and I have no strong objection to this change. Just wanted to point it out.
Right and I appreciate you pointing it out. I mistakenly thought I was following the guidelines!
So, I can see how it’d be useful to have names when using basic types or when passing several arguments of the same type. Maybe we could just remove super redundant names (i.e. “struct page *page”)?
On the other hand, maybe we don’t open this can of worms and I just drop this patch from the patchset..
-dros
PATCH 8/8 pnfs: merge identical functions
In reply to Weston Andros Adamsonpnfs_readhdr_free and pnfs_writehdr_free were identical - merge them info pnfs_pgio_header_free. Also drop EXPORT_SYMBOL_GPL of static function.
Signed-off-by Weston Andros Adamson <[email protected]>
--- fs/nfs/pnfs.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)
fs/nfs/pnfs.c +3 -11
@@ -1552,12 +1552,11 @@ pnfs_do_write(struct nfs_pageio_descriptor *desc,pnfs_put_lseg (lseg); } -static void pnfs_writehdr_free (struct nfs_pgio_header *hdr) +static void pnfs_pgio_header_free (struct nfs_pgio_header *hdr) {pnfs_put_lseg (hdr->lseg);nfs_pgio_header_free (hdr); } -EXPORT_SYMBOL_GPL (pnfs_writehdr_free);int pnfs_generic_pg_writepages (struct nfs_pageio_descriptor *desc)
@@ -1572,7 +1571,7 @@ pnfs_generic_pg_writepages(struct nfs_pageio_descriptor *desc) desc->pg_lseg =NULL ;return -ENOMEM ; } -nfs_pgheader_init (desc, hdr, pnfs_writehdr_free); +nfs_pgheader_init (desc, hdr, pnfs_pgio_header_free); hdr->lseg =pnfs_get_lseg (desc->pg_lseg); ret =nfs_generic_pgio (desc, hdr);if (ret !=0 ) {
@@ -1671,13 +1670,6 @@ pnfs_do_read(struct nfs_pageio_descriptor *desc, struct nfs_pgio_header *hdr)pnfs_put_lseg (lseg); } -static void pnfs_readhdr_free (struct nfs_pgio_header *hdr) -{ -pnfs_put_lseg (hdr->lseg); -nfs_pgio_header_free (hdr); -} -EXPORT_SYMBOL_GPL (pnfs_readhdr_free); -int pnfs_generic_pg_readpages (struct nfs_pageio_descriptor *desc) {
@@ -1692,7 +1684,7 @@ pnfs_generic_pg_readpages(struct nfs_pageio_descriptor *desc) desc->pg_lseg =NULL ;return ret; } -nfs_pgheader_init (desc, hdr, pnfs_readhdr_free); +nfs_pgheader_init (desc, hdr, pnfs_pgio_header_free); hdr->lseg =pnfs_get_lseg (desc->pg_lseg); ret =nfs_generic_pgio (desc, hdr);if (ret !=0 ) {
Signature · 1 line
1.8.5.2 (Apple Git-48)
Re: [PATCH 8/8] pnfs: merge identical functions
fs/nfs/pnfs.c pnfs_do_write(struct nfs_pageio_descriptor *desc, · line 1559
Quoted 6 lines
fs/nfs/pnfs.c +1
-1-static void pnfs_writehdr_free (struct nfs_pgio_header *hdr) +static void pnfs_pgio_header_free (struct nfs_pgio_header *hdr) {pnfs_put_lseg (hdr->lseg);nfs_pgio_header_free (hdr); }
I think it should also be mossible to simply call pnfs_put_lseg from nfs_pgio_header_free. pnfs_put_lseg handles a NULL argument fine, is stubbed out for the non-pnfs case, and the other callers should never have it set.
Re: [PATCH 8/8] pnfs: merge identical functions
Quoted 10 lines · Christoph Hellwig
fs/nfs/pnfs.c pnfs_do_write(struct nfs_pageio_descriptor *desc, · line 1559
Quoted 6 lines
fs/nfs/pnfs.c +1
-1-static void pnfs_writehdr_free (struct nfs_pgio_header *hdr) +static void pnfs_pgio_header_free (struct nfs_pgio_header *hdr) {pnfs_put_lseg (hdr->lseg);nfs_pgio_header_free (hdr); }I think it should also be mossible to simply call
pnfs_put_lsegfromnfs_pgio_header_free.pnfs_put_lseghandles a NULL argument fine, is stubbed out for the non-pnfs case, and the other callers should never have it set.
Every function in this area is identical to each other :). I'm already working on a patch series that combines these functions (and more!). It also needs more testing before I can submit, but I can update against these patches first to see if this unlocks other cleanups.
Anna
Quoted 5 lines
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 8/8] pnfs: merge identical functions
Quoted 11 lines · Anna Schumaker
Quoted 10 lines · Christoph Hellwig
Quoted 6 lines
fs/nfs/pnfs.c +1
-1-static void pnfs_writehdr_free (struct nfs_pgio_header *hdr) +static void pnfs_pgio_header_free (struct nfs_pgio_header *hdr){ pnfs_put_lseg(hdr->lseg); nfs_pgio_header_free(hdr); }I think it should also be mossible to simply call
pnfs_put_lsegfromnfs_pgio_header_free.pnfs_put_lseghandles a NULL argument fine, is stubbed out for the non-pnfs case, and the other callers should never have it set.
Great point.
Quoted 4 lines
Every function in this area is identical to each other :). I'm already working on a patch series that combines these functions (and more!). It also needs more testing before I can submit, but I can update against these patches first to see if this unlocks other cleanups.
Anna
OK, so maybe I’ll just remove this patch from v2 and let you take care of it?
-dros
Re: [PATCH 8/8] pnfs: merge identical functions
Quoted 13 lines · Weston Andros Adamson
Quoted 11 lines · Anna Schumaker
Quoted 10 lines · Christoph Hellwig
Quoted 6 lines
fs/nfs/pnfs.c +1
-1-static void pnfs_writehdr_free (struct nfs_pgio_header *hdr) +static void pnfs_pgio_header_free (struct nfs_pgio_header *hdr){ pnfs_put_lseg(hdr->lseg); nfs_pgio_header_free(hdr); }I think it should also be mossible to simply call
pnfs_put_lsegfromnfs_pgio_header_free.pnfs_put_lseghandles a NULL argument fine, is stubbed out for the non-pnfs case, and the other callers should never have it set.
Quoted 6 lines
Great point.
Quoted 3 lines
Every function in this area is identical to each other :). I'm already working on a patch series that combines these functions (and more!). It also needs more testing before I can submit, but I can update against these patches first to see if this unlocks other cleanups.
Anna
OK, so maybe I�ll just remove this patch from v2 and let you take care of it?
Sure.
Quoted 2 lines
-dros
Re: [PATCH 8/8] pnfs: merge identical functions
In reply to Anna SchumakerQuoted 6 lines · Anna Schumaker
Quoted 4 lines
I think it should also be mossible to simply call
pnfs_put_lsegfromnfs_pgio_header_free.pnfs_put_lseghandles a NULL argument fine, is stubbed out for the non-pnfs case, and the other callers should never have it set.Every function in this area is identical to each other :). I'm already working on a patch series that combines these functions (and more!). It also needs more testing before I can submit, but I can update against these patches first to see if this unlocks other cleanups.
Yes, pnfs.c has lots of duplication of the classic I/O path. I don't think we need to rush out your patches, but it would be good to get them out in the not too far future.
Re: [PATCH 8/8] pnfs: merge identical functions
Quoted 10 lines · Christoph Hellwig
Quoted 5 lines · Anna Schumaker
Quoted 4 lines
I think it should also be mossible to simply call
pnfs_put_lsegfromnfs_pgio_header_free.pnfs_put_lseghandles a NULL argument fine, is stubbed out for the non-pnfs case, and the other callers should never have it set.Every function in this area is identical to each other :). I'm already working on a patch series that combines these functions (and more!). It also needs more testing before I can submit, but I can update against these patches first to see if this unlocks other cleanups.
Yes,
pnfs.chas lots of duplication of the classic I/O path. I don't think we need to rush out your patches, but it would be good to get them out in the not too far future.
Sure. I won't rush anything, but I'll try not to take too long either.
Re: [PATCH 8/8] pnfs: merge identical functions
In reply to Christoph HellwigQuoted 6 lines · Christoph Hellwig
Quoted 5 lines · Anna Schumaker
Quoted 4 lines
I think it should also be mossible to simply call
pnfs_put_lsegfromnfs_pgio_header_free.pnfs_put_lseghandles a NULL argument fine, is stubbed out for the non-pnfs case, and the other callers should never have it set.
Quoted 6 lines
Quoted 1 line
Every function in this area is identical to each other :). I'm already working on a patch series that combines these functions (and more!). It also needs more testing before I can submit, but I can update against these patches first to see if this unlocks other cleanups.
Yes,
pnfs.chas lots of duplication of the classic I/O path. I don't think we need to rush out your patches, but it would be good to get them out in the not too far future.
I say we add them to the pgio branch (or some other public branch) as soon as you’re ready, so we can combine testing efforts.
-dros
Re: [PATCH 8/8] pnfs: merge identical functions
In reply to Christoph HellwigQuoted 10 lines · Christoph Hellwig
fs/nfs/pnfs.c pnfs_do_write(struct nfs_pageio_descriptor *desc, · line 1559
Quoted 6 lines
fs/nfs/pnfs.c +1
-1-static void pnfs_writehdr_free (struct nfs_pgio_header *hdr) +static void pnfs_pgio_header_free (struct nfs_pgio_header *hdr) {pnfs_put_lseg (hdr->lseg);nfs_pgio_header_free (hdr); }I think it should also be mossible to simply call
pnfs_put_lsegfromnfs_pgio_header_free.pnfs_put_lseghandles a NULL argument fine, is stubbed out for the non-pnfs case, and the other callers should never have it set.
pnfs_put_lseg is compiled into the NFS v4 module, so depmod would complain about recursive module dependencies if it was called from the generic client.
Quoted 5 lines
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html