Linus Torvalds d28619f156 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 ... * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: quota: Convert quota statistics to generic percpu_counter ext3 uses rb_node = NULL; to zero rb_root. quota: Fixup dquot_transfer reiserfs: Fix resuming of quotas on remount read-write pohmelfs: Remove dead quota code ufs: Remove dead quota code udf: Remove dead quota code quota: rename default quotactl methods to dquot_ quota: explicitly set ->dq_op and ->s_qcop quota: drop remount argument to ->quota_on and ->quota_off quota: move unmount handling into the filesystem quota: kill the vfs_dq_off and vfs_dq_quota_on_remount wrappers quota: move remount handling into the filesystem ocfs2: Fix use after free on remount read-only Fix up conflicts in fs/ext4/super.c and fs/ufs/file.c		2010-05-30 09:11:11 -07:00
..
cluster	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2010-05-21 07:20:17 -07:00
dlm	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2010-05-21 07:20:17 -07:00
dlmfs	ocfs2_dlmfs: Fix math error when reading LVB.	2010-04-23 15:24:59 -07:00
acl.c	ocfs: constify xattr_handler	2010-05-21 18:31:20 -04:00
acl.h
alloc.c	Merge branch 'discontig-bg' of git://oss.oracle.com/git/tma/linux-2.6 into ocfs2-merge-window	2010-05-18 16:40:42 -07:00
alloc.h	Merge branch 'discontig-bg' of git://oss.oracle.com/git/tma/linux-2.6 into ocfs2-merge-window	2010-05-18 16:40:42 -07:00
aops.c	ocfs2: use allocation reservations during file write	2010-05-05 18:17:30 -07:00
aops.h
blockcheck.c	kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT_MAX and SHRT_MIN	2010-05-25 08:07:02 -07:00
blockcheck.h
buffer_head_io.c	Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2-mark into ocfs2-fixes	2010-04-30 13:37:29 -07:00
buffer_head_io.h
dcache.c
dcache.h
dir.c	Merge branch 'discontig-bg' of git://oss.oracle.com/git/tma/linux-2.6 into ocfs2-merge-window	2010-05-18 16:40:42 -07:00
dir.h
dlmglue.c	ocfs2: Avoid unnecessary block mapping when refreshing quota info	2010-05-21 19:30:46 +02:00
dlmglue.h
export.c
export.h
extent_map.c
extent_map.h
file.c	kill spurious reference to vmtruncate	2010-05-27 22:15:42 -04:00
file.h
heartbeat.c
heartbeat.h
inode.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2010-05-21 07:20:17 -07:00
inode.h	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2010-05-21 07:20:17 -07:00
ioctl.c
ioctl.h
journal.c	ocfs2: Make ocfs2_extend_trans() really extend.	2010-05-05 18:18:09 -07:00
journal.h	ocfs2: Make ocfs2_journal_dirty() void.	2010-05-05 18:17:29 -07:00
Kconfig
localalloc.c	ocfs2/trivial: Code cleanup for allocation reservation.	2010-05-05 18:18:09 -07:00
localalloc.h	ocfs2: increase the default size of local alloc windows	2010-05-05 18:18:07 -07:00
locks.c
locks.h
Makefile	ocfs2: allocation reservations	2010-05-05 18:17:30 -07:00
mmap.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2010-05-21 07:20:17 -07:00
mmap.h
namei.c	ocfs2: replace inode uid,gid,mode initialization with helper function	2010-05-21 18:31:25 -04:00
namei.h
ocfs1_fs_compat.h
ocfs2_fs.h	ocfs2: increase the default size of local alloc windows	2010-05-05 18:18:07 -07:00
ocfs2_ioctl.h
ocfs2_lockid.h
ocfs2_lockingver.h
ocfs2.h	ocfs2: Add dir_resv_level mount option	2010-05-05 18:18:07 -07:00
quota_global.c	ocfs2: Fix NULL pointer deref when writing local dquot	2010-05-21 19:30:48 +02:00
quota_local.c	ocfs2: Fix lock inversion in quotas during umount	2010-05-21 19:30:48 +02:00
quota.h	ocfs2: Fix NULL pointer deref when writing local dquot	2010-05-21 19:30:48 +02:00
refcounttree.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2010-05-21 07:20:17 -07:00
refcounttree.h	Ocfs2: Optimize ocfs2 truncate to use ocfs2_remove_btree_range() instead.	2010-05-18 12:25:10 -07:00
reservations.c	ocfs2/trivial: Code cleanup for allocation reservation.	2010-05-05 18:18:09 -07:00
reservations.h	ocfs2: make ocfs2_adjust_resv_from_alloc simple.	2010-05-05 18:18:09 -07:00
resize.c	ocfs2: Make ocfs2_journal_dirty() void.	2010-05-05 18:17:29 -07:00
resize.h
slot_map.c
slot_map.h
stack_o2cb.c
stack_user.c
stackglue.c
stackglue.h
suballoc.c	ocfs2: Silence a gcc warning.	2010-05-18 16:48:41 -07:00
suballoc.h	ocfs2: allocation reservations	2010-05-05 18:17:30 -07:00
super.c	quota: rename default quotactl methods to dquot_	2010-05-24 14:10:17 +02:00
super.h	ocfs2: Wrap signal blocking in void functions.	2010-05-10 11:50:10 -07:00
symlink.c
symlink.h
sysfile.c
sysfile.h
uptodate.c
uptodate.h
ver.c
ver.h
xattr.c	ocfs: constify xattr_handler	2010-05-21 18:31:20 -04:00
xattr.h	ocfs: constify xattr_handler	2010-05-21 18:31:20 -04:00