diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-08-14 05:44:39 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-29 12:47:35 -0400 |
commit | 2bee1e0f280b159ce8f9f01c2f5c9de410231a3b (patch) | |
tree | 81dc0d6edcc9cef34004863d6f8a77b9b5f24a0e | |
parent | b169395145ce013ad1ed3ee25878112f647ffd56 (diff) |
VFS: collect_mounts() should return an ERR_PTR
commit 52e220d357a38cb29fa2e29f34ed94c1d66357f4 upstream.
This should actually be returning an ERR_PTR on error instead of NULL.
That was how it was designed and all the callers expect it.
[AV: actually, that's what "VFS: Make clone_mnt()/copy_tree()/collect_mounts()
return errors" missed - originally collect_mounts() was expected to return
NULL on failure]
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | fs/namespace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 7b1ca9ba0b0a..a45ba4f267fe 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
@@ -1429,7 +1429,7 @@ struct vfsmount *collect_mounts(struct path *path) | |||
1429 | CL_COPY_ALL | CL_PRIVATE); | 1429 | CL_COPY_ALL | CL_PRIVATE); |
1430 | namespace_unlock(); | 1430 | namespace_unlock(); |
1431 | if (IS_ERR(tree)) | 1431 | if (IS_ERR(tree)) |
1432 | return NULL; | 1432 | return ERR_CAST(tree); |
1433 | return &tree->mnt; | 1433 | return &tree->mnt; |
1434 | } | 1434 | } |
1435 | 1435 | ||