diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2011-11-16 21:52:06 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-03 22:52:39 -0500 |
| commit | 5352d3b65ae6f38e71e16f704414c1db4b4f7228 (patch) | |
| tree | 6e6e30b52e2c87264a7e1ca5880007d64b95de3f | |
| parent | 5ffc2836a2514e3f402327536b5dcc4a5b2d5571 (diff) | |
| download | op-kernel-dev-5352d3b65ae6f38e71e16f704414c1db4b4f7228.zip op-kernel-dev-5352d3b65ae6f38e71e16f704414c1db4b4f7228.tar.gz | |
make nfs_follow_remote_path() handle ERR_PTR() passed as root_mnt
... rather than duplicating that in callers
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/nfs/super.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 73d87f9..0e6dd56 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -2787,11 +2787,15 @@ static struct dentry *nfs_follow_remote_path(struct vfsmount *root_mnt, const char *export_path) { 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); - return ERR_PTR(ret); + return ERR_PTR(err); } 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.export_path = export_path; - res = ERR_CAST(root_mnt); - if (!IS_ERR(root_mnt)) - res = nfs_follow_remote_path(root_mnt, export_path); + res = nfs_follow_remote_path(root_mnt, export_path); dfprintk(MOUNT, "<-- nfs4_try_mount() = %ld%s\n", 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); data->mnt_path = export_path; - res = ERR_CAST(root_mnt); - if (!IS_ERR(root_mnt)) - res = nfs_follow_remote_path(root_mnt, export_path); + res = nfs_follow_remote_path(root_mnt, export_path); dprintk("<-- nfs4_referral_mount() = %ld%s\n", IS_ERR(res) ? PTR_ERR(res) : 0, IS_ERR(res) ? " [error]" : ""); |
