Skip to content

Commit

Permalink
ocfs2: Correct merge of 52f7c21 (Move /sys/o2cb to /sys/fs/o2cb)
Browse files Browse the repository at this point in the history
Commit 52f7c21 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>
  • Loading branch information
Joel Becker authored and Mark Fasheh committed May 1, 2008
1 parent 08acd4f commit 9d80f75
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/ocfs2/cluster/sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 9d80f75

Please sign in to comment.