Joel Becker 9d80f7539a 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>

2008-04-30 17:07:59 -07:00

..

cluster

ocfs2: Correct merge of 52f7c21 (Move /sys/o2cb to /sys/fs/o2cb)

2008-04-30 17:07:59 -07:00

dlm

mm: bdi: add separate writeback accounting capability

2008-04-30 08:29:50 -07:00

alloc.c

ocfs2: Use BUG_ON

2008-04-18 08:56:11 -07:00

alloc.h

ocfs2: Write support for directories with inline data

2007-10-12 11:54:41 -07:00

aops.c

fs/ocfs2/aops.c: test for IS_ERR rather than 0

2008-04-18 08:56:11 -07:00

aops.h

ocfs2: convert to new aops

2007-10-16 09:42:58 -07:00

buffer_head_io.c

ocfs2: clean up bh null checks

2008-01-25 15:05:48 -08:00

buffer_head_io.h

[PATCH 1/2] ocfs2: Add group extend for online resize

2008-01-25 14:53:35 -08:00

dcache.c

ocfs2: Remove mount/unmount votes

2008-01-25 14:45:34 -08:00

dcache.h

ocfs2: Remove special casing for inode creation in ocfs2_dentry_attach_lock()

2006-09-24 13:50:45 -07:00

dir.c

[PATCH] ocfs2: le*_add_cpu conversion

2008-03-03 15:50:21 -08:00

dir.h

ocfs2: Rename cleanups

2007-10-12 11:54:38 -07:00

dlmglue.c

ocfs2: Add the 'cluster_stack' sysfs file.

2008-04-18 08:56:05 -07:00

dlmglue.h

ocfs2: Break out stackglue into modules.

2008-04-18 08:56:05 -07:00

export.c

ocfs2: Silence false lockdep warnings

2008-01-25 15:05:44 -08:00

export.h

exportfs: make struct export_operations const

2007-10-22 08:13:21 -07:00

extent_map.c

ocfs2: Read support for inline data

2007-10-12 11:54:39 -07:00

extent_map.h

ocfs2: Cache extent records

2007-04-26 15:10:40 -07:00

file.c

ocfs2: Convert ocfs2 over to unlocked_ioctl

2008-04-18 08:56:11 -07:00

file.h

[PATCH 1/2] ocfs2: add flock lock type

2008-01-25 15:05:43 -08:00

heartbeat.c

ocfs2: Move o2hb functionality into the stack glue.

2008-04-18 08:56:04 -07:00

heartbeat.h

ocfs2: Move o2hb functionality into the stack glue.

2008-04-18 08:56:04 -07:00

inode.c

ocfs2: convert byte order of constant instead of variable

2008-01-25 15:05:46 -08:00

inode.h

ocfs2: Silence false lockdep warnings

2008-01-25 15:05:44 -08:00

ioctl.c

[PATCH] r/o bind mounts: elevate write count for ioctls()

2008-04-19 00:29:24 -04:00

ioctl.h

ocfs2: Convert ocfs2 over to unlocked_ioctl

2008-04-18 08:56:11 -07:00

journal.c

ocfs2: Use BUG_ON

2008-04-18 08:56:11 -07:00

journal.h

ocfs2: Change the recovery map to an array of node numbers.

2008-04-18 08:56:02 -07:00

localalloc.c

ocfs2: Add inode stealing for ocfs2_reserve_new_inode

2008-04-18 08:56:10 -07:00

localalloc.h

ocfs2: Allow smaller allocations during large writes

2007-09-20 15:06:09 -07:00

locks.c

[PATCH 2/2] ocfs2: cluster aware flock()

2008-01-25 15:05:43 -08:00

locks.h

[PATCH 2/2] ocfs2: cluster aware flock()

2008-01-25 15:05:43 -08:00

Makefile

ocfs2: Allow selection of cluster plug-ins.

2008-04-18 08:56:07 -07:00

mmap.c

ocfs2: Rename ocfs2_meta_[un]lock

2008-01-25 14:46:01 -08:00

mmap.h

…

namei.c

ocfs2: Improve rename locking

2008-04-18 08:56:11 -07:00

namei.h

ocfs2: Move directory manipulation code into dir.c

2007-10-12 11:54:36 -07:00

ocfs1_fs_compat.h

fs/: Spelling fixes

2008-02-03 17:33:42 +02:00

ocfs2_fs.h

ocfs2: Add the USERSPACE_STACK incompat bit.

2008-04-18 08:56:05 -07:00

ocfs2_lockid.h

ocfs2: Change mlog_bug_on to BUG_ON in ocfs2_lockid.h

2008-04-18 08:56:07 -07:00

ocfs2_lockingver.h

ocfs2: Negotiate locking protocol versions.

2008-02-06 16:11:29 -08:00

ocfs2.h

ocfs2: Add inode stealing for ocfs2_reserve_new_inode

2008-04-18 08:56:10 -07:00

resize.c

ocfs2: Fix an endian bug in online resize.

2008-03-10 15:14:07 -07:00

resize.h

[PATCH 2/2] ocfs2: Implement group add for online resize

2008-01-25 15:04:24 -08:00

slot_map.c

ocfs2: Abstract out node number queries.

2008-04-18 08:56:04 -07:00

slot_map.h

ocfs2: De-magic the in-memory slot map.

2008-04-18 08:56:03 -07:00

stack_o2cb.c

ocfs2: Break out stackglue into modules.

2008-04-18 08:56:05 -07:00

stack_user.c

ocfs2: add fsdlm to stackglue

2008-04-18 08:56:07 -07:00

stackglue.c

ocfs2: add fsdlm to stackglue

2008-04-18 08:56:07 -07:00

stackglue.h

ocfs2: add fsdlm to stackglue

2008-04-18 08:56:07 -07:00

suballoc.c

ocfs2: Add inode stealing for ocfs2_reserve_new_inode

2008-04-18 08:56:10 -07:00

suballoc.h

ocfs2: Add ac_alloc_slot in ocfs2_alloc_context

2008-04-18 08:56:10 -07:00

super.c

ocfs2: Add inode stealing for ocfs2_reserve_new_inode

2008-04-18 08:56:10 -07:00

super.h

ocfs2: use s_maxbytes directly in ocfs2_change_file_space()

2007-08-09 17:25:07 -07:00

symlink.c

mm: make read_cache_page synchronous

2007-05-07 12:12:51 -07:00

symlink.h

[PATCH] mark struct inode_operations const 2

2007-02-12 09:48:46 -08:00

sysfile.c

ocfs2: Silence false lockdep warnings

2008-01-25 15:05:44 -08:00

sysfile.h

…

uptodate.c

mm: Remove slab destructors from kmem_cache_create().

2007-07-20 10:11:58 +09:00

uptodate.h

ocfs2: implement directory read-ahead

2006-09-20 15:53:40 -07:00

ver.c

ocfs2: bump version number

2008-01-25 15:05:46 -08:00

ver.h

…