Linus Torvalds 659e45d8a0 Merge branch 'for-linus-min' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs ... Pull the minimal btrfs branch from Chris Mason: "We have a use-after-free in there, along with errors when mount -o discard is enabled, and a BUG_ON(we should compile with UP more often)." * 'for-linus-min' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: use commit root when loading free space cache Btrfs: fix use-after-free in __btrfs_end_transaction Btrfs: check return value of bio_alloc() properly Btrfs: remove lock assert from get_restripe_target() Btrfs: fix eof while discarding extents Btrfs: fix uninit variable in repair_eb_io_failure Revert "Btrfs: increase the global block reserve estimates"		2012-04-13 19:41:27 -07:00
..
acl.c	Btrfs: fix return value of btrfs_get_acl()	2011-10-20 18:10:47 +02:00
async-thread.c	btrfs: return void in functions without error conditions	2012-03-22 01:45:34 +01:00
async-thread.h	btrfs: return void in functions without error conditions	2012-03-22 01:45:34 +01:00
backref.c	Merge git://git.jan-o-sch.net/btrfs-unstable into for-linus	2012-03-28 20:33:40 -04:00
backref.h	Btrfs: fix regression in scrub path resolving	2012-03-27 14:51:21 +02:00
btrfs_inode.h	Btrfs: add a delalloc mutex to inodes for delalloc reservations	2012-01-16 15:29:43 -05:00
check-integrity.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
check-integrity.h	Btrfs: add optional integrity check code	2011-12-21 19:14:09 +01:00
compat.h	Btrfs: drop remaining LINUX_KERNEL_VERSION checks and compat code	2009-01-06 09:38:55 -05:00
compression.c	Merge branch 'for-linus-min' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-04-13 19:41:27 -07:00
compression.h	btrfs: return void in functions without error conditions	2012-03-22 01:45:34 +01:00
ctree.c	Merge branch 'error-handling' into for-linus	2012-03-28 20:31:37 -04:00
ctree.h	Merge branch 'for-chris' of git://github.com/idryomov/btrfs-unstable into for-linus	2012-03-28 20:32:46 -04:00
delayed-inode.c	btrfs: replace many BUG_ONs with proper error handling	2012-03-22 11:52:54 +01:00
delayed-inode.h	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
delayed-ref.c	btrfs: return void in functions without error conditions	2012-03-22 01:45:34 +01:00
delayed-ref.h	Btrfs: add waitqueue instead of doing busy waiting for more delayed refs	2012-01-04 16:12:48 +01:00
dir-item.c	btrfs: replace many BUG_ONs with proper error handling	2012-03-22 11:52:54 +01:00
disk-io.c	Btrfs: update the checks for mixed block groups with big metadata blocks	2012-03-29 17:02:47 -04:00
disk-io.h	btrfs: enhance transaction abort infrastructure	2012-03-22 01:45:40 +01:00
export.c	btrfs: replace many BUG_ONs with proper error handling	2012-03-22 11:52:54 +01:00
export.h
extent-tree.c	Btrfs: use commit root when loading free space cache	2012-04-12 20:54:01 -04:00
extent_io.c	Merge branch 'for-linus-min' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-04-13 19:41:27 -07:00
extent_io.h	Merge branch 'error-handling' into for-linus	2012-03-28 20:31:37 -04:00
extent_map.c	Btrfs: clean up code for merging extent maps	2011-08-01 14:30:50 -04:00
extent_map.h	btrfs: fix structs where bitfields and spinlock/atomic share 8B word	2012-02-15 16:40:25 +01:00
file-item.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-03-30 12:44:29 -07:00
file.c	btrfs: replace many BUG_ONs with proper error handling	2012-03-22 11:52:54 +01:00
free-space-cache.c	Merge branch 'for-linus-min' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-04-13 19:41:27 -07:00
free-space-cache.h	btrfs: remove all unused functions	2011-05-06 12:34:03 +02:00
hash.h	Btrfs: remove crc32c.h and use libcrc32c directly.	2009-06-10 11:29:53 -04:00
inode-item.c	Merge branch 'error-handling' into for-linus	2012-03-28 20:31:37 -04:00
inode-map.c	Btrfs: show useful info in space reservation tracepoint	2012-03-29 09:57:44 -04:00
inode-map.h	Btrfs: Support reading/writing on disk free ino cache	2011-04-25 16:46:11 +08:00
inode.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-03-30 12:44:29 -07:00
ioctl.c	Btrfs: update to the right index of defragment	2012-03-29 09:57:45 -04:00
ioctl.h	Btrfs: add balance progress reporting	2012-01-16 22:04:49 +02:00
Kconfig	Btrfs: add config option to enable btrfs integrity check	2011-12-21 19:14:16 +01:00
locking.c	btrfs: return void in functions without error conditions	2012-03-22 01:45:34 +01:00
locking.h	btrfs: return void in functions without error conditions	2012-03-22 01:45:34 +01:00
lzo.c	btrfs: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:21 +08:00
Makefile	Merge branch 'integrity-check-patch-v2' of git://btrfs.giantdisaster.de/git/btrfs into integration	2012-01-16 15:27:58 -05:00
ordered-data.c	btrfs: return void in functions without error conditions	2012-03-22 01:45:34 +01:00
ordered-data.h	btrfs: return void in functions without error conditions	2012-03-22 01:45:34 +01:00
orphan.c	btrfs: replace many BUG_ONs with proper error handling	2012-03-22 11:52:54 +01:00
print-tree.c	btrfs: fix oops on failure path	2011-10-20 18:10:50 +02:00
print-tree.h
reada.c	Btrfs: introduce common define for max number of mirrors	2012-03-27 14:21:26 -04:00
relocation.c	btrfs: replace many BUG_ONs with proper error handling	2012-03-22 11:52:54 +01:00
root-tree.c	btrfs: replace many BUG_ONs with proper error handling	2012-03-22 11:52:54 +01:00
scrub.c	Merge branch 'for-linus-min' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-04-13 19:41:27 -07:00
struct-funcs.c	Btrfs: add the ability to cache a pointer into the eb	2012-03-26 17:04:23 -04:00
super.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-03-30 12:44:29 -07:00
sysfs.c	btrfs: Remove unused sysfs code	2011-06-17 14:54:18 -04:00
transaction.c	Btrfs: fix use-after-free in __btrfs_end_transaction	2012-04-12 16:03:56 -04:00
transaction.h	btrfs: enhance transaction abort infrastructure	2012-03-22 01:45:40 +01:00
tree-defrag.c	btrfs: drop unused parameter from btrfs_release_path	2011-05-02 13:57:22 +02:00
tree-log.c	btrfs: replace many BUG_ONs with proper error handling	2012-03-22 11:52:54 +01:00
tree-log.h	btrfs: return void in functions without error conditions	2012-03-22 01:45:34 +01:00
ulist.c	Btrfs: generic data structure to build unique lists	2011-12-22 16:22:24 +01:00
ulist.h	Btrfs: generic data structure to build unique lists	2011-12-22 16:22:24 +01:00
version.h
volumes.c	Btrfs: fix eof while discarding extents	2012-04-12 16:03:56 -04:00
volumes.h	btrfs: return void in functions without error conditions	2012-03-22 01:45:34 +01:00
xattr.c	Btrfs: do not use btrfs_end_transaction_throttle everywhere	2012-01-16 15:28:54 -05:00
xattr.h	fs/vfs/security: pass last path component to LSM on inode creation	2011-02-01 11:12:29 -05:00
zlib.c	btrfs: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:21 +08:00