From: Matthew Treinish <treinish@linux.vnet.ibm.com>
To: linux-nfs@vger.kernel.org
Cc: treinish@linux.vnet.ibm.com, Chuck Lever <chuck.lever@oracle.com>
Subject: [PATCH/RFC 4/7] Save root file handle in nfs_server.
Date: Fri, 11 Nov 2011 18:04:29 -0500 [thread overview]
Message-ID: <1321052673-22171-5-git-send-email-treinish@linux.vnet.ibm.com> (raw)
In-Reply-To: <1321052673-22171-1-git-send-email-treinish@linux.vnet.ibm.com>
Save each FSID's root directory file handle in the
export's local nfs_server structure on the client.
This FH can later be used by the migration recovery
logic.
NB: Saving the root FH is done only for NFSv4 mounts.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Matthew Treinish <treinish@linux.vnet.ibm.com>
---
fs/nfs/client.c | 1 +
fs/nfs/getroot.c | 7 +++++++
include/linux/nfs_fs_sb.h | 1 +
3 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 44dedfe..641f69f 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -1108,6 +1108,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..51ca63b 100644
--- a/fs/nfs/getroot.c
+++ b/fs/nfs/getroot.c
@@ -232,6 +232,13 @@ 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) {
+ dprintk("nfs_get_root: alloc rootfh failed\n");
+ ret = ERR_PTR(-ENOMEM);
+ goto out;
+ }
+ 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 706c92b..5261fa1 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 */
--
1.7.4.4
next prev parent reply other threads:[~2011-11-11 23:06 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-11 23:04 [PATCH/RFC 0/7] Volatile Filehandle Client-side Support Matthew Treinish
2011-11-11 23:04 ` [PATCH/RFC 1/7] New mount option for volatile filehandle recovery Matthew Treinish
2011-11-12 0:19 ` Trond Myklebust
2011-11-12 3:35 ` Malahal Naineni
2011-11-11 23:04 ` [PATCH/RFC 2/7] Added support for FH_EXPIRE_TYPE attribute Matthew Treinish
2011-11-11 23:04 ` [PATCH/RFC 3/7] Add VFS objects from nfs4_proc calls into nfs4_exception Matthew Treinish
2011-11-11 23:04 ` Matthew Treinish [this message]
2011-11-11 23:04 ` [PATCH/RFC 5/7] Added VFH FHEXPIRED recovery functions Matthew Treinish
2011-11-12 0:27 ` Trond Myklebust
2011-11-12 3:45 ` Malahal Naineni
2011-11-12 17:16 ` Trond Myklebust
2011-11-14 21:12 ` Matthew Treinish
2011-11-11 23:04 ` [PATCH/RFC 6/7] Perform recovery on both inodes for rename Matthew Treinish
2011-11-11 23:04 ` [PATCH/RFC 7/7] Added error handling for NFS4ERR_FHEXPIRED Matthew Treinish
2011-11-11 23:04 ` [PATCH/RFC] Hard code testing on server <ONLY FOR TESTING> Matthew Treinish
2011-11-12 0:13 ` [PATCH/RFC 0/7] Volatile Filehandle Client-side Support Trond Myklebust
2011-11-12 14:49 ` Christoph Hellwig
2011-11-13 3:54 ` NeilBrown
2011-11-13 13:45 ` Tigran Mkrtchyan
2011-11-13 16:36 ` J. Bruce Fields
2011-11-13 21:07 ` NeilBrown
2011-11-14 0:42 ` J. Bruce Fields
2011-11-14 1:26 ` NeilBrown
2011-11-14 17:27 ` Trond Myklebust
2011-11-15 6:33 ` Trond Myklebust
2012-01-13 17:09 ` Malahal Naineni
2012-01-14 1:38 ` J. Bruce Fields
2012-01-16 16:52 ` Malahal Naineni
2012-01-17 15:18 ` J. Bruce Fields
2012-01-17 17:22 ` Malahal Naineni
2012-01-17 18:47 ` J. Bruce Fields
2012-01-17 19:43 ` Malahal Naineni
2011-11-14 16:29 ` Trond Myklebust
2011-11-13 16:42 ` J. Bruce Fields
2011-11-13 16:45 ` J. Bruce Fields
2011-11-13 18:25 ` Matthew Treinish
2011-11-13 18:06 ` Matthew Treinish
2011-11-14 9:09 ` Tigran Mkrtchyan
2011-11-14 21:47 ` Matthew Treinish
2011-11-15 6:49 ` Trond Myklebust
2011-11-15 22:38 ` 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=1321052673-22171-5-git-send-email-treinish@linux.vnet.ibm.com \
--to=treinish@linux.vnet.ibm.com \
--cc=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