Chris Mason 6b5b817f10 Merge branch 'bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work ...

Conflicts:
	fs/btrfs/extent-tree.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>

2010-10-29 09:27:49 -04:00

..

acl.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

2010-06-11 14:18:47 -07:00

async-thread.c

Btrfs: don't walk around with task->state != TASK_RUNNING

2010-05-25 10:34:58 -04:00

async-thread.h

Btrfs: fix deadlock on async thread startup

2009-10-05 09:44:45 -04:00

btrfs_inode.h

Btrfs: Metadata reservation for orphan inodes

2010-05-25 10:34:52 -04:00

compat.h

Btrfs: drop remaining LINUX_KERNEL_VERSION checks and compat code

2009-01-06 09:38:55 -05:00

compression.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

2010-04-05 13:21:15 -07:00

compression.h

Btrfs: Add zlib compression support

2008-10-29 14:49:59 -04:00

ctree.c

Btrfs: fix split_leaf double split corner case

2010-07-19 16:14:50 -04:00

ctree.h

Merge branch 'bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work

2010-10-29 09:27:49 -04:00

delayed-ref.c

Btrfs: Integrate metadata reservation with start_transaction

2010-05-25 10:34:50 -04:00

delayed-ref.h

Btrfs: Integrate metadata reservation with start_transaction

2010-05-25 10:34:50 -04:00

dir-item.c

Btrfs: Pass transaction handle to security and ACL initialization functions

2009-12-17 12:33:34 -05:00

disk-io.c

Btrfs: write out free space cache

2010-10-29 09:26:29 -04:00

disk-io.h

Btrfs: use async helpers for DIO write checksumming

2010-05-25 10:34:58 -04:00

export.c

Btrfs: change how we mount subvolumes

2010-03-15 10:58:13 -04:00

export.h

NFS support for btrfs - v3

2008-09-25 11:04:06 -04:00

extent_io.c

writeback: remove writeback_inodes_wbc

2010-07-06 08:54:03 +02:00

extent_io.h

Btrfs: rework O_DIRECT enospc handling

2010-05-25 21:52:08 -04:00

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

extent_map.h

Btrfs: search for an allocation hint while filling file COW

2009-09-18 16:08:52 -04:00

extent-tree.c

Merge branch 'bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work

2010-10-29 09:27:49 -04:00

file-item.c

Btrfs: add basic DIO read/write support

2010-05-25 10:34:57 -04:00

file.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

2010-06-11 14:18:47 -07:00

free-space-cache.c

Btrfs: Add a clear_cache mount option

2010-10-29 09:26:36 -04:00

free-space-cache.h

Btrfs: load free space cache if it exists

2010-10-29 09:26:35 -04:00

hash.h

Btrfs: remove crc32c.h and use libcrc32c directly.

2009-06-10 11:29:53 -04:00

inode-item.c

Btrfs: Integrate metadata reservation with start_transaction

2010-05-25 10:34:50 -04:00

inode-map.c

Btrfs: do not reuse objectid of deleted snapshot/subvol

2009-09-21 15:56:00 -04:00

inode.c

Merge branch 'bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work

2010-10-29 09:27:49 -04:00

ioctl.c

Btrfs: fix the df ioctl to report raid types

2010-10-22 15:54:53 -04:00

ioctl.h

Btrfs: use __u64 types in ioctl.h

2010-03-16 14:24:27 -04:00

Kconfig

Revert "task_struct: make journal_info conditional"

2009-12-17 13:23:24 -08:00

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

locking.h

Btrfs: fix spinlock assertions on UP systems

2009-03-09 11:45:38 -04:00

Makefile

Btrfs: Mixed back reference (FORWARD ROLLING FORMAT CHANGE)

2009-06-10 11:29:46 -04:00

ordered-data.c

Btrfs: add basic DIO read/write support

2010-05-25 10:34:57 -04:00

ordered-data.h

Btrfs: add basic DIO read/write support

2010-05-25 10:34:57 -04:00

orphan.c

Btrfs: change how subvolumes are organized

2009-09-21 15:56:00 -04:00

print-tree.c

Btrfs: remove of redundant btrfs_header_level

2009-07-22 16:52:13 -04:00

print-tree.h

Btrfs: Create extent_buffer interface for large blocksizes

2008-09-25 11:03:56 -04:00

ref-cache.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

ref-cache.h

Btrfs: use RB_ROOT to intialize rb_trees instead of setting rb_node to NULL

2010-03-08 16:26:50 -05:00

relocation.c

Merge branch 'bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work

2010-10-29 09:27:49 -04:00

root-tree.c

Btrfs: avoid BUG when dropping root and reference in same transaction

2010-06-11 15:57:39 -04:00

struct-funcs.c

Btrfs: Fix checkpatch.pl warnings

2009-01-05 21:25:51 -05:00

super.c

Merge branch 'bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work

2010-10-29 09:27:49 -04:00

sysfs.c

Driver core: Constify struct sysfs_ops in struct kobj_type

2010-03-07 17:04:49 -08:00

transaction.c

Merge branch 'bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-work

2010-10-29 09:27:49 -04:00

transaction.h

Btrfs: create special free space cache inode

2010-10-28 15:59:09 -04:00

tree-defrag.c

Btrfs: Introduce global metadata reservation

2010-05-25 10:34:52 -04:00

tree-log.c

Btrfs: Metadata ENOSPC handling for tree log

2010-05-25 10:34:53 -04:00

tree-log.h

Btrfs: Metadata ENOSPC handling for tree log

2010-05-25 10:34:53 -04:00

version.h

Update Btrfs files for in-kernel usage

2008-09-25 15:41:59 -04:00

version.sh

Btrfs: Fixes for 2.6.28-rc API changes

2008-11-19 21:17:22 -05:00

volumes.c

block: unify flags for struct bio and struct request

2010-08-07 18:20:39 +02:00

volumes.h

Btrfs: make balance code choose more wisely when relocating

2009-09-21 19:23:48 -04:00

xattr.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

2010-05-27 10:43:44 -07:00

xattr.h

btrfs: constify xattr_handler

2010-05-21 18:31:18 -04:00

zlib.c

Btrfs: correct error-handling zlib error handling

2009-08-07 13:51:33 -04:00