diff options
author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-06-22 12:55:11 -0400 |
---|---|---|
committer | Tom Haynes <loghyr@primarydata.com> | 2015-02-03 14:06:37 -0500 |
commit | 16cecdf620eb23d2654a265d9b20e089370d7425 (patch) | |
tree | 9d8c33a5036ef2722685a452ab2075c8616a3fa9 /fs/nfs | |
parent | 46a5ab4754cad6aeefd96feae8ba65db8655e1af (diff) |
NFSv4.1/NFSv3: Add pNFS callbacks for nfs3_(read|write|commit)_done()
Enable pNFS callbacks to allow flex files to work correctly with a
NFSv3-enabled data server.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/nfs3proc.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c index 524f9f837408..78e557c3ab87 100644 --- a/fs/nfs/nfs3proc.c +++ b/fs/nfs/nfs3proc.c | |||
@@ -800,6 +800,9 @@ static int nfs3_read_done(struct rpc_task *task, struct nfs_pgio_header *hdr) | |||
800 | { | 800 | { |
801 | struct inode *inode = hdr->inode; | 801 | struct inode *inode = hdr->inode; |
802 | 802 | ||
803 | if (hdr->pgio_done_cb != NULL) | ||
804 | return hdr->pgio_done_cb(task, hdr); | ||
805 | |||
803 | if (nfs3_async_handle_jukebox(task, inode)) | 806 | if (nfs3_async_handle_jukebox(task, inode)) |
804 | return -EAGAIN; | 807 | return -EAGAIN; |
805 | 808 | ||
@@ -825,6 +828,9 @@ static int nfs3_write_done(struct rpc_task *task, struct nfs_pgio_header *hdr) | |||
825 | { | 828 | { |
826 | struct inode *inode = hdr->inode; | 829 | struct inode *inode = hdr->inode; |
827 | 830 | ||
831 | if (hdr->pgio_done_cb != NULL) | ||
832 | return hdr->pgio_done_cb(task, hdr); | ||
833 | |||
828 | if (nfs3_async_handle_jukebox(task, inode)) | 834 | if (nfs3_async_handle_jukebox(task, inode)) |
829 | return -EAGAIN; | 835 | return -EAGAIN; |
830 | if (task->tk_status >= 0) | 836 | if (task->tk_status >= 0) |
@@ -845,6 +851,9 @@ static void nfs3_proc_commit_rpc_prepare(struct rpc_task *task, struct nfs_commi | |||
845 | 851 | ||
846 | static int nfs3_commit_done(struct rpc_task *task, struct nfs_commit_data *data) | 852 | static int nfs3_commit_done(struct rpc_task *task, struct nfs_commit_data *data) |
847 | { | 853 | { |
854 | if (data->commit_done_cb != NULL) | ||
855 | return data->commit_done_cb(task, data); | ||
856 | |||
848 | if (nfs3_async_handle_jukebox(task, data->inode)) | 857 | if (nfs3_async_handle_jukebox(task, data->inode)) |
849 | return -EAGAIN; | 858 | return -EAGAIN; |
850 | nfs_refresh_inode(data->inode, data->res.fattr); | 859 | nfs_refresh_inode(data->inode, data->res.fattr); |