tree 2a90335caef4159749eb2c4373a5569126973c75
parent 08acd4f8af42affd8cbed81cc1b69fa12ddb213f
author Joel Becker <Joel.Becker@oracle.com> 1208890004 -0700
committer Mark Fasheh <mfasheh@suse.com> 1209600479 -0700

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>