From: Chuck Lever <chuck.lever@oracle.com>
To: trond.myklebust@netapp.com
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH 10/13] NFS: Save root file handle in nfs_server
Date: Wed, 15 Feb 2012 16:36:08 -0500 [thread overview]
Message-ID: <20120215213608.3254.11662.stgit@ellison.1015granger.net> (raw)
In-Reply-To: <20120215213336.3254.98936.stgit@ellison.1015granger.net>
Save each FSID's root directory file handle in the FSID's nfs_server
structure on the client. For now, only NFSv4 mounts save the root FH.
This is needed for migration recovery.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
fs/nfs/client.c | 1 +
fs/nfs/getroot.c | 5 +++++
include/linux/nfs_fs_sb.h | 1 +
3 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 200e1d8..ada7a05 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -1112,6 +1112,7 @@ void nfs_free_server(struct nfs_server *server)
nfs_put_client(server->nfs_client);
nfs_free_iostats(server->io_stats);
+ nfs_free_fhandle(server->rootfh);
bdi_destroy(&server->backing_dev_info);
kfree(server);
nfs_release_automount_timer();
diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c
index dcb6154..8d4fbe1 100644
--- a/fs/nfs/getroot.c
+++ b/fs/nfs/getroot.c
@@ -232,6 +232,11 @@ struct dentry *nfs4_get_root(struct super_block *sb, struct nfs_fh *mntfh,
ret = ERR_CAST(inode);
goto out;
}
+ server->rootfh = nfs_alloc_fhandle();
+ if (server->rootfh != NULL) {
+ nfs_display_fhandle(mntfh, "nfs_get_root: new root FH");
+ nfs_copy_fh(server->rootfh, mntfh);
+ }
error = nfs_superblock_set_dummy_root(sb, inode);
if (error != 0) {
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index ba4d765..6532d7b 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -157,6 +157,7 @@ struct nfs_server {
struct list_head layouts;
struct list_head delegations;
void (*destroy)(struct nfs_server *);
+ struct nfs_fh *rootfh;
atomic_t active; /* Keep trace of any activity to this server */
next prev parent reply other threads:[~2012-02-15 21:36 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-15 21:34 [PATCH 00/13] For 3.4 (try 2) Chuck Lever
2012-02-15 21:34 ` [PATCH 01/13] NFS: Make nfs_cache_array.size a signed integer Chuck Lever
2012-02-16 19:52 ` Myklebust, Trond
2012-02-16 20:09 ` Chuck Lever
2012-02-16 20:34 ` Myklebust, Trond
2012-02-16 20:53 ` Chuck Lever
2012-02-15 21:35 ` [PATCH 02/13] NFS: Fix comparison signage warnings with slot ID computations Chuck Lever
2012-02-16 19:52 ` Myklebust, Trond
2012-02-16 20:10 ` Chuck Lever
2012-02-15 21:35 ` [PATCH 03/13] SUNRPC: Use KERN_DEFAULT for debugging printk's Chuck Lever
2012-02-15 22:05 ` Malahal Naineni
2012-02-16 19:54 ` Myklebust, Trond
2012-02-15 21:35 ` [PATCH 04/13] nfs: Clean up debugging in nfs_follow_mountpoint() Chuck Lever
2012-02-15 21:35 ` [PATCH 05/13] NFS: Clean up debugging in decode_pathname() Chuck Lever
2012-02-15 21:35 ` [PATCH 06/13] NFS: Add debugging messages to NFSv4's CLOSE procedure Chuck Lever
2012-02-15 21:35 ` [PATCH 07/13] NFS: Reduce debugging noise from encode_compound_hdr Chuck Lever
2012-02-16 20:04 ` Myklebust, Trond
2012-02-16 20:11 ` Chuck Lever
2012-02-15 21:35 ` [PATCH 08/13] SUNRPC: Add API to acquire source address Chuck Lever
2012-02-15 22:12 ` Malahal Naineni
2012-02-15 22:17 ` Chuck Lever
2012-02-16 20:07 ` Myklebust, Trond
2012-02-16 20:13 ` Chuck Lever
2012-02-15 21:36 ` [PATCH 09/13] NFS: Add a client-side function to display NFS file handles Chuck Lever
2012-02-15 21:36 ` Chuck Lever [this message]
2012-02-15 21:36 ` [PATCH 11/13] NFS: Simplify arguments of encode_renew() Chuck Lever
2012-02-15 21:36 ` [PATCH 12/13] NFS: Introduce NFS_ATTR_FATTR_V4_LOCATIONS Chuck Lever
2012-02-15 21:36 ` [PATCH 13/13] NFS: Request fh_expire_type attribute in "server caps" operation Chuck Lever
2012-02-20 15:01 ` Matthew Treinish
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=20120215213608.3254.11662.stgit@ellison.1015granger.net \
--to=chuck.lever@oracle.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@netapp.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;
as well as URLs for NNTP newsgroup(s).