Return-Path: Received: from mail-gx0-f174.google.com ([209.85.161.174]:49509 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754223Ab1EIThW (ORCPT ); Mon, 9 May 2011 15:37:22 -0400 Received: by gxk21 with SMTP id 21so1941561gxk.19 for ; Mon, 09 May 2011 12:37:22 -0700 (PDT) From: Chuck Lever Subject: [PATCH 07/16] NFS: Save root file handle in nfs_server To: trond.myklebust@netapp.com Cc: linux-nfs@vger.kernel.org Date: Mon, 09 May 2011 15:37:19 -0400 Message-ID: <20110509193719.16568.95993.stgit@matisse.1015granger.net> In-Reply-To: <20110509192522.16568.59082.stgit@matisse.1015granger.net> References: <20110509192522.16568.59082.stgit@matisse.1015granger.net> Content-Type: text/plain; charset="utf-8" Sender: linux-nfs-owner@vger.kernel.org List-ID: MIME-Version: 1.0 Save each FSID's root directory file handle in the export's local nfs_server structure on the client. This file handle can later be used for migration recovery. NB: Saving the root FH is done only for NFSv4 mounts. Signed-off-by: Chuck Lever --- 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 b55ef58..bf40649 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -1101,6 +1101,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 87694ca..aa3a912 100644 --- a/include/linux/nfs_fs_sb.h +++ b/include/linux/nfs_fs_sb.h @@ -151,6 +151,7 @@ struct nfs_server { #endif struct list_head delegations; void (*destroy)(struct nfs_server *); + struct nfs_fh *rootfh; atomic_t active; /* Keep trace of any activity to this server */