summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Becker <Joel.Becker@oracle.com>2008-04-22 11:46:44 -0700
committerMark Fasheh <mfasheh@suse.com>2008-04-30 17:07:59 -0700
commit9d80f7539a91c0154e40fc9e4ae5e818dd8f102e (patch)
tree2a90335caef4159749eb2c4373a5569126973c75
parent08acd4f8af42affd8cbed81cc1b69fa12ddb213f (diff)
downloadop-kernel-dev-9d80f7539a91c0154e40fc9e4ae5e818dd8f102e.zip
op-kernel-dev-9d80f7539a91c0154e40fc9e4ae5e818dd8f102e.tar.gz
ocfs2: Correct merge of 52f7c21 (Move /sys/o2cb to /sys/fs/o2cb)
Commit 52f7c21b613f80cb425d115c9e5b4ed958a133c0 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>
-rw-r--r--fs/ocfs2/cluster/sys.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/cluster/sys.c b/fs/ocfs2/cluster/sys.c
index 98429fd..bc702da 100644
--- a/fs/ocfs2/cluster/sys.c
+++ b/fs/ocfs2/cluster/sys.c
@@ -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;
OpenPOWER on IntegriCloud