Joel Becker 9d80f7539a ocfs2: Correct merge of 52f7c21 (Move /sys/o2cb to /sys/fs/o2cb) ... Commit 52f7c21b61 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>		2008-04-30 17:07:59 -07:00
..
heartbeat.c
heartbeat.h
Makefile	ocfs2/net: Add debug interface to o2net	2008-04-18 08:56:20 -07:00
masklog.c
masklog.h
netdebug.c	ocfs2/net: Add debug interface to o2net	2008-04-18 08:56:20 -07:00
nodemanager.c	ocfs2/net: Add debug interface to o2net	2008-04-18 08:56:20 -07:00
nodemanager.h
ocfs2_heartbeat.h
ocfs2_nodemanager.h
quorum.c
quorum.h
sys.c	ocfs2: Correct merge of 52f7c21 (Move /sys/o2cb to /sys/fs/o2cb)	2008-04-30 17:07:59 -07:00
sys.h
tcp_internal.h	ocfs2/net: Add debug interface to o2net	2008-04-18 08:56:20 -07:00
tcp.c	ocfs2/net: Add debug interface to o2net	2008-04-18 08:56:20 -07:00
tcp.h	ocfs2/net: Add debug interface to o2net	2008-04-18 08:56:20 -07:00
ver.c
ver.h