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	[PATCH] Fix possibly too long write in o2hb_setup_one_bio()	2007-11-06 15:35:35 -08:00
heartbeat.h	ocfs2: Update default cluster timeouts	2008-01-25 15:05:45 -08:00
Makefile	ocfs2/net: Add debug interface to o2net	2008-04-18 08:56:20 -07:00
masklog.c	kset: convert ocfs2 to use kset_create	2008-01-24 20:40:23 -08:00
masklog.h	ocfs2: Filter -ENOSPC in mlog_errno()	2007-11-27 16:47:01 -08:00
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: live heartbeat depends on the local node configuration	2007-07-10 17:19:43 -07:00
ocfs2_heartbeat.h	ocfs2: warn the user on a dead timeout mismatch	2006-06-29 15:45:35 -07:00
ocfs2_nodemanager.h
quorum.c	ocfs2: Replace panic() with emergency_restart() when fencing	2007-04-26 13:39:02 -07:00
quorum.h	[PATCH] OCFS2: The Second Oracle Cluster Filesystem	2006-01-03 11:45:46 -08:00
sys.c	ocfs2: Correct merge of 52f7c21 (Move /sys/o2cb to /sys/fs/o2cb)	2008-04-30 17:07:59 -07:00
sys.h	[PATCH] OCFS2: The Second Oracle Cluster Filesystem	2006-01-03 11:45:46 -08:00
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	ocfs2: bump version number	2008-01-25 15:05:46 -08:00
ver.h