aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4proc.c
diff options
context:
space:
mode:
authorBryan Schumaker <bjschuma@netapp.com>2012-05-10 15:07:30 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-05-14 20:30:25 -0400
commit3028eb2b324c517da1e9e589743c4a5154f70dd1 (patch)
tree9f2f13e0bea581bac9f68a8f516a3018e3d78e15 /fs/nfs/nfs4proc.c
parent0427708657750bdc03af3491a0297cab5e7efabf (diff)
NFS: Rename nfs4_proc_get_root()
This function is really getting the root filehandle and not the root dentry of the filesystem. I also removed the rpc_ops lookup from nfs4_get_rootfh() under the assumption that if we reach this function then we already know we are using NFS v4. Signed-off-by: Bryan Schumaker <bjschuma@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r--fs/nfs/nfs4proc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 98eb48ddc25..69212d2f882 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2345,8 +2345,8 @@ static int nfs4_find_root_sec(struct nfs_server *server, struct nfs_fh *fhandle,
2345/* 2345/*
2346 * get the file handle for the "/" directory on the server 2346 * get the file handle for the "/" directory on the server
2347 */ 2347 */
2348static int nfs4_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle, 2348int nfs4_proc_get_rootfh(struct nfs_server *server, struct nfs_fh *fhandle,
2349 struct nfs_fsinfo *info) 2349 struct nfs_fsinfo *info)
2350{ 2350{
2351 int minor_version = server->nfs_client->cl_minorversion; 2351 int minor_version = server->nfs_client->cl_minorversion;
2352 int status = nfs4_lookup_root(server, fhandle, info); 2352 int status = nfs4_lookup_root(server, fhandle, info);
@@ -6539,7 +6539,7 @@ const struct nfs_rpc_ops nfs_v4_clientops = {
6539 .dir_inode_ops = &nfs4_dir_inode_operations, 6539 .dir_inode_ops = &nfs4_dir_inode_operations,
6540 .file_inode_ops = &nfs4_file_inode_operations, 6540 .file_inode_ops = &nfs4_file_inode_operations,
6541 .file_ops = &nfs4_file_operations, 6541 .file_ops = &nfs4_file_operations,
6542 .getroot = nfs4_proc_get_root, 6542 .getroot = nfs4_proc_get_rootfh,
6543 .submount = nfs4_submount, 6543 .submount = nfs4_submount,
6544 .getattr = nfs4_proc_getattr, 6544 .getattr = nfs4_proc_getattr,
6545 .setattr = nfs4_proc_setattr, 6545 .setattr = nfs4_proc_setattr,