Jens Axboe 7407cf355f Merge branch 'master' into for-2.6.35 ...

Conflicts:
	fs/block_dev.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

2010-04-29 09:36:24 +02:00

..

acl.c

sanitize xattr handler prototypes

2009-12-16 12:16:49 -05:00

acl.h

ext[234]: move over to 'check_acl' permission model

2009-09-08 11:09:04 -07:00

balloc.c

ext4: consolidate in_range() definitions

2010-03-03 23:55:01 -05:00

bitmap.c

ext4: Change unsigned long to unsigned int

2008-11-05 00:14:04 -05:00

block_validity.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

dir.c

ext4: fix up rb_root initializations to use RB_ROOT

2010-03-04 22:25:21 -05:00

ext4_extents.h

ext4: Calculate metadata requirements more accurately

2010-01-01 02:41:30 -05:00

ext4_jbd2.c

ext4: Fix BUG_ON at fs/buffer.c:652 in no journal mode

2010-02-16 15:06:29 -05:00

ext4_jbd2.h

ext4: use ext4_get_block_write in buffer write

2010-03-04 16:14:02 -05:00

ext4.h

Merge branch 'write_inode2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

2010-03-05 11:53:53 -08:00

extents.c

ext4: Fix buffer head leaks after calls to ext4_get_inode_loc()

2010-04-03 17:44:16 -04: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

fsync.c

blkdev: generalize flags for blkdev_issue_fn functions

2010-04-28 19:47:36 +02:00

hash.c

ext4: Add support for non-native signed/unsigned htree hash algorithms

2008-10-28 13:21:44 -04:00

ialloc.c

ext4: Fixed inode allocator to correctly track a flex_bg's used_dirs

2010-03-23 21:32:00 -04:00

inode.c

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2010-04-25 10:01:51 -07:00

ioctl.c

ext4: Code cleanup for EXT4_IOC_MOVE_EXT ioctl

2010-03-04 00:39:24 -05:00

Kconfig

ext4: Don't ask about supporting ext2/3 in ext4 if ext4 is not configured

2009-12-21 10:54:09 -05:00

Makefile

ext4: online defrag -- Add EXT4_IOC_MOVE_EXT ioctl

2009-06-17 19:24:03 -04:00

mballoc.c

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2010-04-25 10:01:51 -07:00

mballoc.h

ext4: consolidate in_range() definitions

2010-03-03 23:55:01 -05:00

migrate.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

move_extent.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

namei.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

resize.c

ext4: move __func__ into a macro for ext4_warning, ext4_error

2010-02-15 14:19:27 -05:00

super.c

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2010-03-25 14:10:53 -07:00

symlink.c

ext4: Rename ext4dev to ext4

2008-10-10 20:02:48 -04:00

xattr_security.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

xattr_trusted.c

sanitize xattr handler prototypes

2009-12-16 12:16:49 -05:00

xattr_user.c

sanitize xattr handler prototypes

2009-12-16 12:16:49 -05:00

xattr.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

xattr.h

ext4: Rename ext4dev to ext4

2008-10-10 20:02:48 -04:00