kernel-hacking-2024-linux-s.../fs/ocfs2
David S. Miller aa2ba5f108 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/ixgbe/ixgbe_main.c
	drivers/net/smc91x.c
2008-12-02 19:50:27 -08:00
..
cluster fs: replace NIPQUAD() 2008-10-31 00:56:28 -07:00
dlm ocfs2: fix return value set in init_dlmfs_fs() 2008-12-01 14:46:55 -08:00
alloc.c ocfs2: Simplify ocfs2_read_block() 2008-10-14 11:51:57 -07:00
alloc.h
aops.c ocfs2: Simplify ocfs2_read_block() 2008-10-14 11:51:57 -07:00
aops.h
buffer_head_io.c ocfs2: fix regression in ocfs2_read_blocks_sync() 2008-12-01 14:46:58 -08:00
buffer_head_io.h ocfs2: Make cached block reads the common case. 2008-10-14 11:58:22 -07:00
dcache.c
dcache.h
dir.c ocfs2: Make cached block reads the common case. 2008-10-14 11:58:22 -07:00
dir.h
dlmglue.c ocfs2: fix wake_up in unlock_ast 2008-12-01 14:46:45 -08:00
dlmglue.h
export.c [PATCH] switch all filesystems over to d_obtain_alias 2008-10-23 05:13:01 -04:00
export.h
extent_map.c ocfs2: Simplify ocfs2_read_block() 2008-10-14 11:51:57 -07:00
extent_map.h
file.c ocfs2: truncate outstanding block after direct io failure 2008-11-10 09:51:47 -08:00
file.h
heartbeat.c
heartbeat.h
inode.c ocfs2: Set journal descriptor to NULL after journal shutdown 2008-11-10 09:51:47 -08:00
inode.h ocfs2: Move ocfs2_bread() into dir.c 2008-10-14 11:58:03 -07:00
ioctl.c
ioctl.h
journal.c ocfs2: Set journal descriptor to NULL after journal shutdown 2008-11-10 09:51:47 -08:00
journal.h
localalloc.c ocfs2: Make cached block reads the common case. 2008-10-14 11:58:22 -07:00
localalloc.h
locks.c
locks.h
Makefile ocfs2: Move trusted and user attribute support into xattr.c 2008-10-13 17:02:44 -07:00
mmap.c ocfs2: return 0 in page_mkwrite to let VFS retry. 2008-11-10 09:51:47 -08:00
mmap.h
namei.c ocfs2: Let inode be really deleted when ocfs2_mknod_locked() fails 2008-11-10 09:51:46 -08:00
namei.h
ocfs1_fs_compat.h
ocfs2.h ocfs2: comments typo fix 2008-12-01 14:46:31 -08:00
ocfs2_fs.h ocfs2: Fix some typos in xattr annotations. 2008-11-10 09:51:46 -08:00
ocfs2_jbd_compat.h
ocfs2_lockid.h
ocfs2_lockingver.h
resize.c ocfs2: Simplify ocfs2_read_block() 2008-10-14 11:51:57 -07:00
resize.h
slot_map.c ocfs2: Make cached block reads the common case. 2008-10-14 11:58:22 -07:00
slot_map.h
stack_o2cb.c
stack_user.c ocfs2: initialize stack_user lvbptr 2008-12-01 14:46:39 -08:00
stackglue.c
stackglue.h
suballoc.c ocfs2: Simplify ocfs2_read_block() 2008-10-14 11:51:57 -07:00
suballoc.h
super.c
super.h
symlink.c ocfs2: Simplify ocfs2_read_block() 2008-10-14 11:51:57 -07:00
symlink.h
sysfile.c
sysfile.h
uptodate.c
uptodate.h
ver.c
ver.h
xattr.c ocfs2: Check search result in ocfs2_xattr_block_get() 2008-11-10 09:51:47 -08:00
xattr.h ocfs2: fix function declaration and definition in xattr 2008-11-10 09:51:44 -08:00