[PATCH] 9p: fix bogus return code checks during initialization (f94b3470) · Commits · 戴 / test

There is a simple logic error in init_v9fs - the return code checks are reversed. This patch fixes the return code and adds some messages to prevent module initialization from failing silently. Signed-off-by:

Eric Van Hensbergen <ericvh@gmail.com> Signed-off-by:

Andrew Morton <akpm@osdl.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

fs/9p/mux.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -132,8 +132,10 @@ int v9fs_mux_global_init(void)
		v9fs_mux_poll_tasks[i].task = NULL;

		v9fs_mux_wq = create_workqueue("v9fs");
		if (!v9fs_mux_wq)
		if (!v9fs_mux_wq) {
		printk(KERN_WARNING "v9fs: mux: creating workqueue failed\n");
		return -ENOMEM;
		}

		return 0;
		}

fs/9p/v9fs.c

+8 −3

Original line number	Diff line number	Diff line
		@@ -457,14 +457,19 @@ static int __init init_v9fs(void)

		v9fs_error_init();

		printk(KERN_INFO "Installing v9fs 9P2000 file system support\n");
		printk(KERN_INFO "Installing v9fs 9p2000 file system support\n");

		ret = v9fs_mux_global_init();
		if (!ret)
		if (ret) {
		printk(KERN_WARNING "v9fs: starting mux failed\n");
		return ret;
		}
		ret = register_filesystem(&v9fs_fs_type);
		if (!ret)
		if (ret) {
		printk(KERN_WARNING "v9fs: registering file system failed\n");
		v9fs_mux_global_exit();
		}

		return ret;
		}

Admin message