leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFS: Remove extra dprintk()s from namespace.c

Browse Source 
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Anna Schumaker 2017-04-07 14:15:09 -04:00 committed by Trond Myklebust
parent fe4f844d49
commit e36d48e9e2
1 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
fs/nfs/namespace.c
View File

@ -143,11 +143,8 @@ struct vfsmount *nfs_d_automount(struct path *path)
struct nfs_fh *fh = NULL; struct nfs_fh *fh = NULL;
struct nfs_fattr *fattr = NULL; struct nfs_fattr *fattr = NULL;
dprintk("--> nfs_d_automount()\n");
mnt = ERR_PTR(-ESTALE);
if (IS_ROOT(path->dentry)) if (IS_ROOT(path->dentry))
goto out_nofree; return ERR_PTR(-ESTALE);
mnt = ERR_PTR(-ENOMEM); mnt = ERR_PTR(-ENOMEM);
fh = nfs_alloc_fhandle(); fh = nfs_alloc_fhandle();
@ -155,13 +152,10 @@ struct vfsmount *nfs_d_automount(struct path *path)
if (fh == NULL || fattr == NULL) if (fh == NULL || fattr == NULL)
goto out; goto out;
dprintk("%s: enter\n", __func__);
mnt = server->nfs_client->rpc_ops->submount(server, path->dentry, fh, fattr); mnt = server->nfs_client->rpc_ops->submount(server, path->dentry, fh, fattr);
if (IS_ERR(mnt)) if (IS_ERR(mnt))
goto out; goto out;
dprintk("%s: done, success\n", __func__);
mntget(mnt); /* prevent immediate expiration */ mntget(mnt); /* prevent immediate expiration */
mnt_set_expiry(mnt, &nfs_automount_list); mnt_set_expiry(mnt, &nfs_automount_list);
schedule_delayed_work(&nfs_automount_task, nfs_mountpoint_expiry_timeout); schedule_delayed_work(&nfs_automount_task, nfs_mountpoint_expiry_timeout);
@ -169,11 +163,6 @@ struct vfsmount *nfs_d_automount(struct path *path)
out: out:
nfs_free_fattr(fattr); nfs_free_fattr(fattr);
nfs_free_fhandle(fh); nfs_free_fhandle(fh);
out_nofree:
if (IS_ERR(mnt))
dprintk("<-- %s(): error %ld\n", __func__, PTR_ERR(mnt));
else
dprintk("<-- %s() = %p\n", __func__, mnt);
return mnt; return mnt;
} }
@ -248,27 +237,20 @@ struct vfsmount *nfs_do_submount(struct dentry *dentry, struct nfs_fh *fh,
.fattr = fattr, .fattr = fattr,
.authflavor = authflavor, .authflavor = authflavor,
}; };
struct vfsmount *mnt = ERR_PTR(-ENOMEM); struct vfsmount *mnt;
char *page = (char *) __get_free_page(GFP_USER); char *page = (char *) __get_free_page(GFP_USER);
char *devname; char *devname;
dprintk("--> nfs_do_submount()\n");
dprintk("%s: submounting on %pd2\n", __func__,
dentry);
if (page == NULL) if (page == NULL)
goto out; return ERR_PTR(-ENOMEM);
devname = nfs_devname(dentry, page, PAGE_SIZE);
mnt = (struct vfsmount *)devname;
if (IS_ERR(devname))
goto free_page;
mnt = nfs_do_clone_mount(NFS_SB(dentry->d_sb), devname, &mountdata);
free_page:
free_page((unsigned long)page);
out:
dprintk("%s: done\n", __func__);
dprintk("<-- nfs_do_submount() = %p\n", mnt); devname = nfs_devname(dentry, page, PAGE_SIZE);
if (IS_ERR(devname))
mnt = (struct vfsmount *)devname;
else
mnt = nfs_do_clone_mount(NFS_SB(dentry->d_sb), devname, &mountdata);
free_page((unsigned long)page);
return mnt; return mnt;
} }
EXPORT_SYMBOL_GPL(nfs_do_submount); EXPORT_SYMBOL_GPL(nfs_do_submount);