linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chuck Lever <chuck.lever@oracle.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH 05/21] NFS: Introduce a vector of migration recovery ops
Date: Thu, 17 Oct 2013 14:12:39 -0400	[thread overview]
Message-ID: <20131017181239.1073.50044.stgit@nfsvm18.us.oracle.com> (raw)
In-Reply-To: <20131017180630.1073.18400.stgit@nfsvm18.us.oracle.com>

The differences between minor version 0 and minor version 1
migration will be abstracted by the addition of a set of migration
recovery ops.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 fs/nfs/nfs4_fs.h  |    4 ++++
 fs/nfs/nfs4proc.c |   10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index fcae728..4f48000 100644
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -50,6 +50,7 @@ struct nfs4_minor_version_ops {
 	const struct nfs4_state_recovery_ops *reboot_recovery_ops;
 	const struct nfs4_state_recovery_ops *nograce_recovery_ops;
 	const struct nfs4_state_maintenance_ops *state_renewal_ops;
+	const struct nfs4_mig_recovery_ops *mig_recovery_ops;
 };
 
 #define NFS_SEQID_CONFIRMED 1
@@ -203,6 +204,9 @@ struct nfs4_state_maintenance_ops {
 	int (*renew_lease)(struct nfs_client *, struct rpc_cred *);
 };
 
+struct nfs4_mig_recovery_ops {
+};
+
 extern const struct dentry_operations nfs4_dentry_operations;
 
 /* dir.c */
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index d53d678..e4bd317 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -7887,6 +7887,14 @@ static const struct nfs4_state_maintenance_ops nfs41_state_renewal_ops = {
 };
 #endif
 
+static const struct nfs4_mig_recovery_ops nfs40_mig_recovery_ops = {
+};
+
+#if defined(CONFIG_NFS_V4_1)
+static const struct nfs4_mig_recovery_ops nfs41_mig_recovery_ops = {
+};
+#endif	/* CONFIG_NFS_V4_1 */
+
 static const struct nfs4_minor_version_ops nfs_v4_0_minor_ops = {
 	.minor_version = 0,
 	.init_caps = NFS_CAP_READDIRPLUS
@@ -7902,6 +7910,7 @@ static const struct nfs4_minor_version_ops nfs_v4_0_minor_ops = {
 	.reboot_recovery_ops = &nfs40_reboot_recovery_ops,
 	.nograce_recovery_ops = &nfs40_nograce_recovery_ops,
 	.state_renewal_ops = &nfs40_state_renewal_ops,
+	.mig_recovery_ops = &nfs40_mig_recovery_ops,
 };
 
 #if defined(CONFIG_NFS_V4_1)
@@ -7922,6 +7931,7 @@ static const struct nfs4_minor_version_ops nfs_v4_1_minor_ops = {
 	.reboot_recovery_ops = &nfs41_reboot_recovery_ops,
 	.nograce_recovery_ops = &nfs41_nograce_recovery_ops,
 	.state_renewal_ops = &nfs41_state_renewal_ops,
+	.mig_recovery_ops = &nfs41_mig_recovery_ops,
 };
 #endif
 


  parent reply	other threads:[~2013-10-17 18:12 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-17 18:12 [PATCH 00/21] Basic NFSv4 migration support Chuck Lever
2013-10-17 18:12 ` [PATCH 01/21] SUNRPC: Modify synopsis of rpc_client_register() Chuck Lever
2013-10-17 18:12 ` [PATCH 02/21] SUNRPC: Add a helper to switch the transport of an rpc_clnt Chuck Lever
2013-10-17 18:12 ` [PATCH 03/21] NFS: Add nfs4_update_server Chuck Lever
2013-10-17 18:12 ` [PATCH 04/21] NFS: Add functions to swap transports during migration recovery Chuck Lever
2013-10-17 18:12 ` Chuck Lever [this message]
2013-10-17 18:12 ` [PATCH 06/21] NFS: Export _nfs_display_fhandle() Chuck Lever
2013-10-17 18:12 ` [PATCH 07/21] NFS: Add method to retrieve fs_locations during migration recovery Chuck Lever
2013-10-17 18:12 ` [PATCH 08/21] NFS: Add a super_block backpointer to the nfs_server struct Chuck Lever
2013-10-17 18:13 ` [PATCH 09/21] NFS: Add basic migration support to state manager thread Chuck Lever
2013-10-17 18:13 ` [PATCH 10/21] NFS: Re-use exit code in nfs4_async_handle_error() Chuck Lever
2013-10-17 18:13 ` [PATCH 11/21] NFS: Rename "stateid_invalid" label Chuck Lever
2013-10-17 18:13 ` [PATCH 12/21] NFS: Add migration recovery callouts in nfs4proc.c Chuck Lever
2013-10-17 18:13 ` [PATCH 13/21] NFS: Handle NFS4ERR_MOVED during delegation recall Chuck Lever
2013-10-17 18:13 ` [PATCH 14/21] NFS: Add method to detect whether an FSID is still on the server Chuck Lever
2013-10-17 18:13 ` [PATCH 15/21] NFS: Support NFS4ERR_LEASE_MOVED recovery in state manager Chuck Lever
2013-10-17 18:13 ` [PATCH 16/21] NFS: Implement support for NFS4ERR_LEASE_MOVED Chuck Lever
2013-10-17 18:13 ` [PATCH 17/21] NFS: Migration support for RELEASE_LOCKOWNER Chuck Lever
2013-10-17 18:13 ` [PATCH 18/21] NFS: Handle NFS4ERR_LEASE_MOVED during async RENEW Chuck Lever
2013-10-17 18:13 ` [PATCH 19/21] NFS: Handle SEQ4_STATUS_LEASE_MOVED Chuck Lever
2013-10-17 18:14 ` [PATCH 20/21] NFS: Set EXCHGID4_FLAG_SUPP_MOVED_MIGR Chuck Lever
2013-10-17 18:14 ` [PATCH 21/21] NFS: Fix possible endless state recovery wait Chuck Lever

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=20131017181239.1073.50044.stgit@nfsvm18.us.oracle.com \
    --to=chuck.lever@oracle.com \
    --cc=linux-nfs@vger.kernel.org \
    /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;
as well as URLs for NNTP newsgroup(s).