diff options
author | Fred Isaman <iisaman@netapp.com> | 2011-02-28 20:34:15 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-03-11 15:38:42 -0500 |
commit | bae724ef95b0d0a1f4518f5451e7c8aabc41f820 (patch) | |
tree | 07a2c1866698f183235f7133ac7c004121717bf8 /fs/nfs/pnfs.c | |
parent | 94ad1c80e28f9700c84b4d28d1e5302ddf63a6fd (diff) |
NFSv4.1: shift pnfs_update_layout locations
Move the pnfs_update_layout call location to nfs_pageio_do_add_request().
Grab the lseg sent in the doio function to nfs_read_rpcsetup and attach
it to each nfs_read_data so it can be sent to the layout driver.
Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Andy Adamson <andros@citi.umich.edu>
Signed-off-by: Dean Hildebrand <dhildeb@us.ibm.com>
Signed-off-by: Fred Isaman <iisaman@citi.umich.edu>
Signed-off-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Tao Guo <guotao@nrchpc.ac.cn>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/pnfs.c')
-rw-r--r-- | fs/nfs/pnfs.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 330cee115de0..77966ecb0a2c 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c | |||
@@ -245,7 +245,7 @@ put_lseg_common(struct pnfs_layout_segment *lseg) | |||
245 | rpc_wake_up(&NFS_SERVER(inode)->roc_rpcwaitq); | 245 | rpc_wake_up(&NFS_SERVER(inode)->roc_rpcwaitq); |
246 | } | 246 | } |
247 | 247 | ||
248 | static void | 248 | void |
249 | put_lseg(struct pnfs_layout_segment *lseg) | 249 | put_lseg(struct pnfs_layout_segment *lseg) |
250 | { | 250 | { |
251 | struct inode *inode; | 251 | struct inode *inode; |
@@ -784,7 +784,6 @@ pnfs_update_layout(struct inode *ino, | |||
784 | out: | 784 | out: |
785 | dprintk("%s end, state 0x%lx lseg %p\n", __func__, | 785 | dprintk("%s end, state 0x%lx lseg %p\n", __func__, |
786 | nfsi->layout ? nfsi->layout->plh_flags : -1, lseg); | 786 | nfsi->layout ? nfsi->layout->plh_flags : -1, lseg); |
787 | put_lseg(lseg); /* STUB - callers currently ignore return value */ | ||
788 | return lseg; | 787 | return lseg; |
789 | out_unlock: | 788 | out_unlock: |
790 | spin_unlock(&ino->i_lock); | 789 | spin_unlock(&ino->i_lock); |
@@ -858,20 +857,26 @@ out_forget_reply: | |||
858 | goto out; | 857 | goto out; |
859 | } | 858 | } |
860 | 859 | ||
861 | static void | 860 | static int pnfs_read_pg_test(struct nfs_pageio_descriptor *pgio, |
862 | pnfs_set_pg_test(struct inode *inode, struct nfs_pageio_descriptor *pgio) | 861 | struct nfs_page *prev, |
862 | struct nfs_page *req) | ||
863 | { | 863 | { |
864 | struct pnfs_layoutdriver_type *ld; | 864 | if (pgio->pg_count == prev->wb_bytes) { |
865 | 865 | /* This is first coelesce call for a series of nfs_pages */ | |
866 | ld = NFS_SERVER(inode)->pnfs_curr_ld; | 866 | pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode, |
867 | pgio->pg_test = (ld ? ld->pg_test : NULL); | 867 | prev->wb_context, |
868 | IOMODE_READ); | ||
869 | } | ||
870 | return NFS_SERVER(pgio->pg_inode)->pnfs_curr_ld->pg_test(pgio, prev, req); | ||
868 | } | 871 | } |
869 | 872 | ||
870 | void | 873 | void |
871 | pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, | 874 | pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, struct inode *inode) |
872 | struct inode *inode) | ||
873 | { | 875 | { |
874 | pnfs_set_pg_test(inode, pgio); | 876 | struct pnfs_layoutdriver_type *ld; |
877 | |||
878 | ld = NFS_SERVER(inode)->pnfs_curr_ld; | ||
879 | pgio->pg_test = (ld && ld->pg_test) ? pnfs_read_pg_test : NULL; | ||
875 | } | 880 | } |
876 | 881 | ||
877 | /* | 882 | /* |