Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ... Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c		2010-03-08 16:55:37 +01:00
..
cluster	ocfs2: Use a separate masklog for AST and BASTs	2010-02-27 19:57:06 -08:00
dlm	dlm: allow dlm do recovery during shutdown	2010-02-26 15:41:19 -08:00
dlmfs	ocfs2/userdlm: Add tracing in userdlm	2010-02-27 19:57:07 -08:00
acl.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2009-12-24 12:59:11 -08:00
acl.h	ocfs2: Always include ACL support	2009-10-28 23:05:57 -07:00
alloc.c	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6	2010-03-05 13:20:53 -08:00
alloc.h	ocfs2: Find proper end cpos for a leaf refcount block.	2009-12-02 16:14:57 -08:00
aops.c	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6	2010-03-05 13:20:53 -08:00
aops.h	ocfs2: Add CoW support.	2009-09-22 20:09:36 -07:00
blockcheck.c	tree-wide: fix typos "offest" -> "offset"	2009-12-04 15:39:50 +01:00
blockcheck.h	ocfs2: Add statistics for the checksum and ecc operations.	2009-06-03 19:15:36 -07:00
buffer_head_io.c	ocfs2/trivial: Remove trailing whitespaces	2010-01-25 19:20:51 -08:00
buffer_head_io.h	ocfs2: Take the inode out of the metadata read/write paths.	2009-09-04 16:07:48 -07:00
dcache.c	ocfs2: invalidate dentry if its dentry_lock isn't initialized.	2009-08-27 18:10:54 -07:00
dcache.h	ocfs2: Fix deadlock on umount	2009-07-21 15:47:55 -07:00
dir.c	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6	2010-03-05 13:20:53 -08:00
dir.h	ocfs2: Introduce dir free space list	2009-04-03 11:39:16 -07:00
dlmglue.c	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
dlmglue.h	ocfs2: Add new refcount tree lock resource in dlmglue.	2009-09-22 20:09:28 -07:00
export.c	ocfs2/trivial: Remove trailing whitespaces	2010-01-25 19:20:51 -08:00
export.h	exportfs: make struct export_operations const	2007-10-22 08:13:21 -07:00
extent_map.c	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
extent_map.h	ocfs2: Return extent flags for xattr value tree.	2009-09-22 20:09:39 -07:00
file.c	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6	2010-03-05 13:20:53 -08:00
file.h	ocfs2: Integrate CoW in file write.	2009-09-22 20:09:37 -07: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	dquot: cleanup dquot initialize routine	2010-03-05 00:20:30 +01:00
inode.h	ocfs2: Drop struct inode from ocfs2_extent_tree_operations.	2009-09-04 16:07:57 -07:00
ioctl.c	ocfs2: Use compat_ptr in reflink_arguments.	2010-02-02 18:56:37 -08:00
ioctl.h	Ocfs2: Move ocfs2 ioctl definitions from ocfs2_fs.h to newly added ocfs2_ioctl.h	2010-03-02 14:10:20 -08:00
journal.c	ocfs2/trivial: Remove trailing whitespaces	2010-01-25 19:20:51 -08:00
journal.h	ocfs2: Decrement refcount when truncating refcounted extents.	2009-09-22 20:09:35 -07:00
Kconfig	ocfs2: Always include ACL support	2009-10-28 23:05:57 -07:00
localalloc.c	ocfs2: add extent block stealing for ocfs2 v5	2010-02-26 15:41:07 -08:00
localalloc.h	ocfs2: throttle back local alloc when low on disk space	2008-10-13 13:57:57 -07:00
locks.c	ocfs2: POSIX file locks support	2008-10-13 13:57:57 -07:00
locks.h	ocfs2: POSIX file locks support	2008-10-13 13:57:57 -07:00
Makefile	ocfs2_dlmfs: Move to its own directory	2010-02-26 15:41:14 -08:00
mmap.c	const: mark struct vm_struct_operations	2009-09-27 11:39:25 -07:00
mmap.h
namei.c	dquot: cleanup dquot initialize routine	2010-03-05 00:20:30 +01:00
namei.h	ocfs2: Create reflinked file in orphan dir.	2009-09-22 20:09:48 -07:00
ocfs1_fs_compat.h	fs/: Spelling fixes	2008-02-03 17:33:42 +02:00
ocfs2_fs.h	Ocfs2: Move ocfs2 ioctl definitions from ocfs2_fs.h to newly added ocfs2_ioctl.h	2010-03-02 14:10:20 -08:00
ocfs2_ioctl.h	Ocfs2: Move ocfs2 ioctl definitions from ocfs2_fs.h to newly added ocfs2_ioctl.h	2010-03-02 14:10:20 -08:00
ocfs2_lockid.h	ocfs2: Add new refcount tree lock resource in dlmglue.	2009-09-22 20:09:28 -07:00
ocfs2_lockingver.h	ocfs2_dlmfs: Enable the use of user cluster stacks.	2010-02-26 15:41:18 -08:00
ocfs2.h	Ocfs2: Move ocfs2 ioctl definitions from ocfs2_fs.h to newly added ocfs2_ioctl.h	2010-03-02 14:10:20 -08:00
quota_global.c	dquot: cleanup dquot initialize routine	2010-03-05 00:20:30 +01:00
quota_local.c	bitops: rename for_each_bit() to for_each_set_bit()	2010-03-06 11:26:23 -08:00
quota.h	quota: Move definition of QFMT_OCFS2 to linux/quota.h	2009-12-10 15:02:53 +01:00
refcounttree.c	Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6	2010-03-05 13:20:53 -08:00
refcounttree.h	ocfs2: Add ioctl for reflink.	2009-09-22 20:09:51 -07:00
resize.c	ocfs2: Pass struct ocfs2_caching_info to the journal functions.	2009-09-04 16:07:50 -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: Take the inode out of the metadata read/write paths.	2009-09-04 16:07:48 -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: Hang the locking proto on the cluster conn and use it in asts.	2010-02-26 15:41:16 -08:00
stack_user.c	ocfs2: Remove the ast pointers from ocfs2_stack_plugins	2010-02-26 15:41:16 -08:00
stackglue.c	ocfs2_dlmfs: Enable the use of user cluster stacks.	2010-02-26 15:41:18 -08:00
stackglue.h	ocfs2_dlmfs: Enable the use of user cluster stacks.	2010-02-26 15:41:18 -08:00
suballoc.c	ocfs2: add extent block stealing for ocfs2 v5	2010-02-26 15:41:07 -08:00
suballoc.h	ocfs2: add extent block stealing for ocfs2 v5	2010-02-26 15:41:07 -08:00
super.c	ocfs2: add extent block stealing for ocfs2 v5	2010-02-26 15:41:07 -08:00
super.h	ocfs2: use s_maxbytes directly in ocfs2_change_file_space()	2007-08-09 17:25:07 -07:00
symlink.c	ocfs2: Fix refcnt leak on ocfs2_fast_follow_link() error path	2010-01-11 15:38:50 -08:00
symlink.h	[PATCH] mark struct inode_operations const 2	2007-02-12 09:48:46 -08:00
sysfile.c	ocfs2/trivial: Wrap ocfs2_sysfile_cluster_lock_key within define.	2009-06-22 14:34:29 -07:00
sysfile.h
uptodate.c	ocfs2/trivial: Remove trailing whitespaces	2010-01-25 19:20:51 -08:00
uptodate.h	ocfs2: Pass struct ocfs2_caching_info to the journal functions.	2009-09-04 16:07:50 -07:00
ver.c	ocfs2: bump version number	2008-01-25 15:05:46 -08:00
ver.h
xattr.c	ocfs2: Handle errors while setting external xattr values.	2010-02-26 15:41:13 -08:00
xattr.h	ocfs2: Always include ACL support	2009-10-28 23:05:57 -07:00