diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2011-03-16 05:27:27 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2011-03-16 16:27:04 -0400 |
commit | 0d5839ad05acd0fe2a84a39f33ac5efdf634a5a5 (patch) | |
tree | a84d6d3a1169a8ff4598cf1337c5e5e75863f6e2 /fs/nfs/getroot.c | |
parent | 60ed8cf78f886753e454b671841c0a3a0e55e915 (diff) |
nfs: propagate devname to nfs{,4}_get_root()
step 1 of ->mnt_devname fixes: make sure we have the value of devname
available in ..._get_root().
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfs/getroot.c')
-rw-r--r-- | fs/nfs/getroot.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c index b5ffe8fa291f..4d6e5a317e6d 100644 --- a/fs/nfs/getroot.c +++ b/fs/nfs/getroot.c | |||
@@ -75,7 +75,8 @@ static int nfs_superblock_set_dummy_root(struct super_block *sb, struct inode *i | |||
75 | /* | 75 | /* |
76 | * get an NFS2/NFS3 root dentry from the root filehandle | 76 | * get an NFS2/NFS3 root dentry from the root filehandle |
77 | */ | 77 | */ |
78 | struct dentry *nfs_get_root(struct super_block *sb, struct nfs_fh *mntfh) | 78 | struct dentry *nfs_get_root(struct super_block *sb, struct nfs_fh *mntfh, |
79 | const char *devname) | ||
79 | { | 80 | { |
80 | struct nfs_server *server = NFS_SB(sb); | 81 | struct nfs_server *server = NFS_SB(sb); |
81 | struct nfs_fsinfo fsinfo; | 82 | struct nfs_fsinfo fsinfo; |
@@ -169,7 +170,8 @@ out: | |||
169 | /* | 170 | /* |
170 | * get an NFS4 root dentry from the root filehandle | 171 | * get an NFS4 root dentry from the root filehandle |
171 | */ | 172 | */ |
172 | struct dentry *nfs4_get_root(struct super_block *sb, struct nfs_fh *mntfh) | 173 | struct dentry *nfs4_get_root(struct super_block *sb, struct nfs_fh *mntfh, |
174 | const char *devname) | ||
173 | { | 175 | { |
174 | struct nfs_server *server = NFS_SB(sb); | 176 | struct nfs_server *server = NFS_SB(sb); |
175 | struct nfs_fattr *fattr = NULL; | 177 | struct nfs_fattr *fattr = NULL; |