Commit 9d80f753 authored Apr 22, 2008 by Joel Becker Committed by Mark Fasheh Apr 30, 2008

o2cb)



Commit 52f7c21b was intended to move
/sys/o2cb to /sys/fs/o2cb, providing /sys/o2cb as a symlink for
backwards compatibility.  However, the merge apparently added the
symlink but failed to move the directory, resulting in a duplicate
filename error.  It's a one-line change that was missing.

Signed-off-by: Joel Becker <joel.becker@oracle.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>

parent 08acd4f8

fs/ocfs2/cluster/sys.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ int o2cb_sys_init(void)
		{
		int ret;

		o2cb_kset = kset_create_and_add("o2cb", NULL, NULL);
		o2cb_kset = kset_create_and_add("o2cb", NULL, fs_kobj);
		if (!o2cb_kset)
		return -ENOMEM;