aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/namespace.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-03-16 06:32:07 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-03-16 16:48:06 -0400
commitf8ad9c4bae99854c961ca79ed130a0d11d9ab53c (patch)
treede466d67c6413ba5a0fed1733768f21e1ffc2acf /fs/nfs/namespace.c
parentb514f872f86d4b0c13fed74a1fe1f7ab500c4fd0 (diff)
nfs: nfs_do_{ref,sub}mount() superblock argument is redundant
It's always equal to dentry->d_sb Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfs/namespace.c')
-rw-r--r--fs/nfs/namespace.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c
index 859cdaba4c1c..c0b8344db0c6 100644
--- a/fs/nfs/namespace.c
+++ b/fs/nfs/namespace.c
@@ -25,8 +25,7 @@ static LIST_HEAD(nfs_automount_list);
25static DECLARE_DELAYED_WORK(nfs_automount_task, nfs_expire_automounts); 25static DECLARE_DELAYED_WORK(nfs_automount_task, nfs_expire_automounts);
26int nfs_mountpoint_expiry_timeout = 500 * HZ; 26int nfs_mountpoint_expiry_timeout = 500 * HZ;
27 27
28static struct vfsmount *nfs_do_submount(struct super_block *sb, 28static struct vfsmount *nfs_do_submount(struct dentry *dentry,
29 struct dentry *dentry,
30 struct nfs_fh *fh, 29 struct nfs_fh *fh,
31 struct nfs_fattr *fattr); 30 struct nfs_fattr *fattr);
32 31
@@ -164,9 +163,9 @@ struct vfsmount *nfs_d_automount(struct path *path)
164 } 163 }
165 164
166 if (fattr->valid & NFS_ATTR_FATTR_V4_REFERRAL) 165 if (fattr->valid & NFS_ATTR_FATTR_V4_REFERRAL)
167 mnt = nfs_do_refmount(path->mnt->mnt_sb, path->dentry); 166 mnt = nfs_do_refmount(path->dentry);
168 else 167 else
169 mnt = nfs_do_submount(path->mnt->mnt_sb, path->dentry, fh, fattr); 168 mnt = nfs_do_submount(path->dentry, fh, fattr);
170 if (IS_ERR(mnt)) 169 if (IS_ERR(mnt))
171 goto out; 170 goto out;
172 171
@@ -230,19 +229,17 @@ static struct vfsmount *nfs_do_clone_mount(struct nfs_server *server,
230 229
231/** 230/**
232 * nfs_do_submount - set up mountpoint when crossing a filesystem boundary 231 * nfs_do_submount - set up mountpoint when crossing a filesystem boundary
233 * @sb - superblock of parent directory
234 * @dentry - parent directory 232 * @dentry - parent directory
235 * @fh - filehandle for new root dentry 233 * @fh - filehandle for new root dentry
236 * @fattr - attributes for new root inode 234 * @fattr - attributes for new root inode
237 * 235 *
238 */ 236 */
239static struct vfsmount *nfs_do_submount(struct super_block *sb, 237static struct vfsmount *nfs_do_submount(struct dentry *dentry,
240 struct dentry *dentry,
241 struct nfs_fh *fh, 238 struct nfs_fh *fh,
242 struct nfs_fattr *fattr) 239 struct nfs_fattr *fattr)
243{ 240{
244 struct nfs_clone_mount mountdata = { 241 struct nfs_clone_mount mountdata = {
245 .sb = sb, 242 .sb = dentry->d_sb,
246 .dentry = dentry, 243 .dentry = dentry,
247 .fh = fh, 244 .fh = fh,
248 .fattr = fattr, 245 .fattr = fattr,
@@ -262,7 +259,7 @@ static struct vfsmount *nfs_do_submount(struct super_block *sb,
262 mnt = (struct vfsmount *)devname; 259 mnt = (struct vfsmount *)devname;
263 if (IS_ERR(devname)) 260 if (IS_ERR(devname))
264 goto free_page; 261 goto free_page;
265 mnt = nfs_do_clone_mount(NFS_SB(sb), devname, &mountdata); 262 mnt = nfs_do_clone_mount(NFS_SB(dentry->d_sb), devname, &mountdata);
266free_page: 263free_page:
267 free_page((unsigned long)page); 264 free_page((unsigned long)page);
268out: 265out: