Linux NFS development
 help / color / mirror / Atom feed
From: Tom Haynes <thomas.haynes@primarydata.com>
To: Trond Myklebust <trond.myklebust@primarydata.com>
Cc: Linux NFS Mailing list <linux-nfs@vger.kernel.org>
Subject: [PATCH v3 16/49] NFSv4.1/NFSv3: Add pNFS callbacks for nfs3_(read|write|commit)_done()
Date: Tue,  6 Jan 2015 16:28:21 -0800	[thread overview]
Message-ID: <1420590534-84063-17-git-send-email-loghyr@primarydata.com> (raw)
In-Reply-To: <1420590534-84063-1-git-send-email-loghyr@primarydata.com>

From: Trond Myklebust <trond.myklebust@primarydata.com>

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>
---
 fs/nfs/nfs3proc.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
index 524f9f8..78e557c 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)
 {
 	struct inode *inode = hdr->inode;
 
+	if (hdr->pgio_done_cb != NULL)
+		return hdr->pgio_done_cb(task, hdr);
+
 	if (nfs3_async_handle_jukebox(task, inode))
 		return -EAGAIN;
 
@@ -825,6 +828,9 @@ static int nfs3_write_done(struct rpc_task *task, struct nfs_pgio_header *hdr)
 {
 	struct inode *inode = hdr->inode;
 
+	if (hdr->pgio_done_cb != NULL)
+		return hdr->pgio_done_cb(task, hdr);
+
 	if (nfs3_async_handle_jukebox(task, inode))
 		return -EAGAIN;
 	if (task->tk_status >= 0)
@@ -845,6 +851,9 @@ static void nfs3_proc_commit_rpc_prepare(struct rpc_task *task, struct nfs_commi
 
 static int nfs3_commit_done(struct rpc_task *task, struct nfs_commit_data *data)
 {
+	if (data->commit_done_cb != NULL)
+		return data->commit_done_cb(task, data);
+
 	if (nfs3_async_handle_jukebox(task, data->inode))
 		return -EAGAIN;
 	nfs_refresh_inode(data->inode, data->res.fattr);
-- 
1.9.3


  parent reply	other threads:[~2015-01-07  0:29 UTC|newest]

Thread overview: 74+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-07  0:28 [PATCH v3 00/49] *** Add Flexfile Layout Module *** Tom Haynes
2015-01-07  0:28 ` [PATCH v3 01/49] pnfs: Prepare for flexfiles by pulling out common code Tom Haynes
2015-01-12 18:59   ` Anna Schumaker
2015-01-12 19:10     ` Tom Haynes
2015-01-12 19:13       ` Christoph Hellwig
2015-01-07  0:28 ` [PATCH v3 02/49] pnfs: Do not grab the commit_info lock twice when rescheduling writes Tom Haynes
2015-01-07  0:28 ` [PATCH v3 03/49] nfs41: pull data server cache from file layout to generic pnfs Tom Haynes
2015-01-07 14:56   ` Christoph Hellwig
2015-01-07 18:28     ` Tom Haynes
2015-01-13 19:48       ` Tom Haynes
2015-01-07  0:28 ` [PATCH v3 04/49] nfs41: pull decode_ds_addr " Tom Haynes
2015-01-12 16:19   ` Anna Schumaker
2015-01-13 19:43     ` Tom Haynes
2015-01-07  0:28 ` [PATCH v3 05/49] nfs41: pull nfs4_ds_connect " Tom Haynes
2015-01-07 14:56   ` Christoph Hellwig
2015-01-07  0:28 ` [PATCH v3 06/49] nfs41: allow LD to choose DS connection auth flavor Tom Haynes
2015-01-07  0:28 ` [PATCH v3 07/49] nfs41: move file layout macros to generic pnfs Tom Haynes
2015-01-07  0:28 ` [PATCH v3 08/49] nfsv3: introduce nfs3_set_ds_client Tom Haynes
2015-01-07  0:28 ` [PATCH v3 09/49] nfs41: allow LD to choose DS connection version/minor_version Tom Haynes
2015-01-07  0:28 ` [PATCH v3 10/49] nfs41: create NFSv3 DS connection if specified Tom Haynes
2015-01-07  0:28 ` [PATCH v3 11/49] pnfs: Add nfs_rpc_ops in calls to nfs_initiate_pgio Tom Haynes
2015-01-12 18:41   ` Anna Schumaker
2015-01-12 18:51     ` Tom Haynes
2015-01-07  0:28 ` [PATCH v3 12/49] nfs: allow different protocol in nfs_initiate_commit Tom Haynes
2015-01-07  0:28 ` [PATCH v3 13/49] nfs4: pass slot table to nfs40_setup_sequence Tom Haynes
2015-01-07  0:28 ` [PATCH v3 14/49] nfs4: export nfs4_sequence_done Tom Haynes
2015-01-07  0:28 ` [PATCH v3 15/49] nfs: allow to specify cred in nfs_initiate_pgio Tom Haynes
2015-01-07  0:28 ` Tom Haynes [this message]
2015-01-07  0:28 ` [PATCH v3 17/49] sunrpc: add rpc_count_iostats_idx Tom Haynes
2015-01-07  0:28 ` [PATCH v3 18/49] nfs: set hostname when creating nfsv3 ds connection Tom Haynes
2015-01-07  0:28 ` [PATCH v3 19/49] nfs/flexclient: export pnfs_layoutcommit_inode Tom Haynes
2015-01-07  0:28 ` [PATCH v3 20/49] nfs41: close a small race window when adding new layout to global list Tom Haynes
2015-01-07  0:28 ` [PATCH v3 21/49] nfs41: serialize first layoutget of a file Tom Haynes
2015-01-07  0:28 ` [PATCH v3 22/49] nfs: save server READ/WRITE/COMMIT status Tom Haynes
2015-01-07  0:28 ` [PATCH v3 23/49] nfs41: pass iomode through layoutreturn args Tom Haynes
2015-01-07  0:28 ` [PATCH v3 24/49] nfs41: make a helper function to send layoutreturn Tom Haynes
2015-01-07  0:28 ` [PATCH v3 25/49] nfs41: add a helper to mark layout for return Tom Haynes
2015-01-07  0:28 ` [PATCH v3 26/49] nfs41: don't use a layout if it is marked for returning Tom Haynes
2015-01-07  0:28 ` [PATCH v3 27/49] nfs41: send layoutreturn in last put_lseg Tom Haynes
2015-01-07  0:28 ` [PATCH v3 28/49] nfs41: clear NFS_LAYOUT_RETURN if layoutreturn is sent or failed to send Tom Haynes
2015-01-07  0:28 ` [PATCH v3 29/49] nfs/filelayout: use pnfs_error_mark_layout_for_return Tom Haynes
2015-01-07  0:28 ` [PATCH v3 30/49] nfs: introduce pg_cleanup op for pgio descriptors Tom Haynes
2015-01-07  0:28 ` [PATCH v3 31/49] pnfs: release lseg in pnfs_generic_pg_cleanup Tom Haynes
2015-01-07  0:28 ` [PATCH v3 32/49] nfs: handle overlapping reqs in lock_and_join Tom Haynes
2015-01-07  0:28 ` [PATCH v3 33/49] nfs: rename pgio header ds_idx to ds_commit_idx Tom Haynes
2015-01-07  0:28 ` [PATCH v3 34/49] pnfs: pass ds_commit_idx through the commit path Tom Haynes
2015-01-13 15:37   ` Anna Schumaker
2015-01-13 16:10     ` Weston Andros Adamson
2015-01-07  0:28 ` [PATCH v3 35/49] nfs: add mirroring support to pgio layer Tom Haynes
2015-01-07  0:28 ` [PATCH v3 36/49] nfs: mirroring support for direct io Tom Haynes
2015-01-07  0:28 ` [PATCH v3 37/49] pnfs: fail comparison when bucket verifier not set Tom Haynes
2015-01-07  0:28 ` [PATCH v3 38/49] nfs41: add a debug warning if we destroy an unempty layout Tom Haynes
2015-01-07  0:28 ` [PATCH v3 39/49] nfs: only reset desc->pg_mirror_idx when mirroring is supported Tom Haynes
2015-01-07  0:28 ` [PATCH v3 40/49] nfs: add nfs_pgio_current_mirror helper Tom Haynes
2015-01-07  0:28 ` [PATCH v3 41/49] pnfs: allow LD to ask to resend read through pnfs Tom Haynes
2015-01-07  0:28 ` [PATCH v3 42/49] nfs41: add range to layoutreturn args Tom Haynes
2015-01-13 19:15   ` Anna Schumaker
2015-01-13 19:42     ` Tom Haynes
2015-01-13 19:51       ` Anna Schumaker
2015-01-13 22:50         ` Tom Haynes
2015-01-14 13:40           ` Anna Schumaker
2015-01-07  0:28 ` [PATCH v3 43/49] nfs41: allow async version layoutreturn Tom Haynes
2015-01-07  0:28 ` [PATCH v3 44/49] nfs41: introduce NFS_LAYOUT_RETURN_BEFORE_CLOSE Tom Haynes
2015-01-07  0:28 ` [PATCH v3 45/49] nfs/flexfiles: send layoutreturn before freeing lseg Tom Haynes
2015-01-07  0:28 ` [PATCH v3 46/49] nfs41: add NFS_LAYOUT_RETRY_LAYOUTGET to layout header flags Tom Haynes
2015-01-07  0:28 ` [PATCH v3 47/49] nfs: add a helper to set NFS_ODIRECT_RESCHED_WRITES to direct writes Tom Haynes
2015-01-07  0:28 ` [PATCH v3 48/49] nfs41: wait for LAYOUTRETURN before retrying LAYOUTGET Tom Haynes
2015-01-07  0:28 ` [PATCH v3 49/49] pnfs/flexfiles: Add the FlexFile Layout Driver Tom Haynes
2015-01-08 14:45 ` [PATCH v3 00/49] *** Add Flexfile Layout Module *** Christoph Hellwig
2015-01-08 15:20   ` Anna Schumaker
2015-01-08 18:13     ` Tom Haynes
2015-01-08 16:02   ` Weston Andros Adamson
2015-01-08 17:07   ` Tom Haynes
2015-01-08 19:36     ` Tom Haynes

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1420590534-84063-17-git-send-email-loghyr@primarydata.com \
    --to=thomas.haynes@primarydata.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=trond.myklebust@primarydata.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox