Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

make nfs_follow_remote_path() handle ERR_PTR() passed as root_mnt

Browse Source 
... rather than duplicating that in callers

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2011-11-16 21:52:06 -05:00
parent 5ffc2836a2
commit 5352d3b65a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/nfs/super.c
View File

@ -2787,11 +2787,15 @@ static struct dentry *nfs_follow_remote_path(struct vfsmount *root_mnt,
const char *export_path) const char *export_path)
{ {
struct dentry *dentry; struct dentry *dentry;
int ret = nfs_referral_loop_protect(); int err;
if (ret) { if (IS_ERR(root_mnt))
return ERR_CAST(root_mnt);
err = nfs_referral_loop_protect();
if (err) {
mntput(root_mnt); mntput(root_mnt);
return ERR_PTR(ret); return ERR_PTR(err);
} }
dentry = mount_subtree(root_mnt, export_path); dentry = mount_subtree(root_mnt, export_path);
@ -2815,9 +2819,7 @@ static struct dentry *nfs4_try_mount(int flags, const char *dev_name,
data->nfs_server.hostname); data->nfs_server.hostname);
data->nfs_server.export_path = export_path; data->nfs_server.export_path = export_path;
res = ERR_CAST(root_mnt); res = nfs_follow_remote_path(root_mnt, export_path);
if (!IS_ERR(root_mnt))
res = nfs_follow_remote_path(root_mnt, export_path);
dfprintk(MOUNT, "<-- nfs4_try_mount() = %ld%s\n", dfprintk(MOUNT, "<-- nfs4_try_mount() = %ld%s\n",
IS_ERR(res) ? PTR_ERR(res) : 0, IS_ERR(res) ? PTR_ERR(res) : 0,
@ -3078,9 +3080,7 @@ static struct dentry *nfs4_referral_mount(struct file_system_type *fs_type,
flags, data, data->hostname); flags, data, data->hostname);
data->mnt_path = export_path; data->mnt_path = export_path;
res = ERR_CAST(root_mnt); res = nfs_follow_remote_path(root_mnt, export_path);
if (!IS_ERR(root_mnt))
res = nfs_follow_remote_path(root_mnt, export_path);
dprintk("<-- nfs4_referral_mount() = %ld%s\n", dprintk("<-- nfs4_referral_mount() = %ld%s\n",
IS_ERR(res) ? PTR_ERR(res) : 0, IS_ERR(res) ? PTR_ERR(res) : 0,
IS_ERR(res) ? " [error]" : ""); IS_ERR(res) ? " [error]" : "");