Commit 9d80f753 authored by Joel Becker's avatar Joel Becker Committed by Mark Fasheh
Browse files

ocfs2: Correct merge of 52f7c21b (Move /sys/o2cb to /sys/fs/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: default avatarJoel Becker <>
Acked-by: default avatarRandy Dunlap <>
Signed-off-by: default avatarMark Fasheh <>
parent 08acd4f8
......@@ -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;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment