diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-15 17:16:40 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-17 11:09:33 -0400 |
commit | 8dd3775889345850ecddd689b5c200cdd91bd8c9 (patch) | |
tree | ea697cfcac3f3a927e90d0048e9ed76b5a3ea8e5 /fs/nfs/read.c | |
parent | 95a13f7b33be87d85d8e6652126a3f4d64d164db (diff) |
NFSv4.1: Clean ups and bugfixes for the pNFS read/writeback/commit code
Move more pnfs-isms out of the generic commit code.
Bugfixes:
- filelayout_scan_commit_lists doesn't need to get/put the lseg.
In fact since it is run under the inode->i_lock, the lseg_put()
can deadlock.
- Ensure that we distinguish between what needs to be done for
commit-to-data server and what needs to be done for commit-to-MDS
using the new flag PG_COMMIT_TO_DS. Otherwise we may end up calling
put_lseg() on a bucket for a struct nfs_page that got written
through the MDS.
- Fix a case where we were using list_del() on an nfs_page->wb_list
instead of list_del_init().
- filelayout_initiate_commit needs to call filelayout_commit_release
on error instead of the mds_ops->rpc_release(). Otherwise it won't
clear the commit lock.
Cleanups:
- Let the files layout manage the commit lists for the pNFS case.
Don't expose stuff like pnfs_choose_commit_list, and the fact
that the commit buckets hold references to the layout segment
in common code.
- Cast out the put_lseg() calls for the struct nfs_read/write_data->lseg
into the pNFS layer from whence they came.
- Let the pNFS layer manage the NFS_INO_PNFS_COMMIT bit.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Fred Isaman <iisaman@netapp.com>
Diffstat (limited to 'fs/nfs/read.c')
-rw-r--r-- | fs/nfs/read.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/read.c b/fs/nfs/read.c index 3c2540d532c7..2662c0298dd0 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c | |||
@@ -66,7 +66,6 @@ void nfs_readdata_free(struct nfs_read_data *p) | |||
66 | 66 | ||
67 | void nfs_readdata_release(struct nfs_read_data *rdata) | 67 | void nfs_readdata_release(struct nfs_read_data *rdata) |
68 | { | 68 | { |
69 | put_lseg(rdata->lseg); | ||
70 | put_nfs_open_context(rdata->args.context); | 69 | put_nfs_open_context(rdata->args.context); |
71 | nfs_readdata_free(rdata); | 70 | nfs_readdata_free(rdata); |
72 | } | 71 | } |