Commit dc171580 authored Dec 10, 2014 by Jan Kara Committed by Linus Torvalds Dec 10, 2014

ocfs2: fix error handling when creating debugfs root in ocfs2_init()



Error handling if creation of root of debugfs in ocfs2_init() fails is
broken.  Although error code is set we fail to exit ocfs2_init() with
error and thus initialization ends with success.  Later when mounting a
filesystem, ocfs2 debugfs entries end up being created in the root of
debugfs filesystem which is confusing.

Fix the error handling to bail out.

Coverity id: 1227009.

Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Joseph Qi <joseph.qi@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 86b9c6f3

fs/ocfs2/super.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1622,8 +1622,9 @@ static int __init ocfs2_init(void)

		ocfs2_debugfs_root = debugfs_create_dir("ocfs2", NULL);
		if (!ocfs2_debugfs_root) {
		status = -EFAULT;
		status = -ENOMEM;
		mlog(ML_ERROR, "Unable to create ocfs2 debugfs root.\n");
		goto out4;
		}

		ocfs2_set_locking_protocol();

Admin message