Commit 52e220d3 authored Aug 14, 2013 by Dan Carpenter Committed by Al Viro Aug 24, 2013

VFS: collect_mounts() should return an ERR_PTR



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]

Cc: <stable@vger.kernel.org> # 3.10+
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

parent 821ff77c

fs/namespace.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1429,7 +1429,7 @@ struct vfsmount collect_mounts(struct path path)
		CL_COPY_ALL \| CL_PRIVATE);
		namespace_unlock();
		if (IS_ERR(tree))
		return NULL;
		return ERR_CAST(tree);
		return &tree->mnt;
		}