Linus Torvalds 271fd5d728 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs ... Pull btrfs fixes from Chris Mason: "The big ones here are a memory leak we introduced in rc1, and a scheduling while atomic if the transid on disk doesn't match the transid we expected. This happens for corrupt blocks, or out of date disks. It also fixes up the ioctl definition for our ioctl to resolve logical inode numbers. The __u32 was a merging error and doesn't match what we ship in the progs." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: avoid sleeping in verify_parent_transid while atomic Btrfs: fix crash in scrub repair code when device is missing btrfs: Fix mismatching struct members in ioctl.h Btrfs: fix page leak when allocing extent buffers Btrfs: Add properly locking around add_root_to_dirty_list		2012-05-06 10:20:07 -07:00
..
acl.c
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	Btrfs: add missing read locks in backref.c	2012-04-18 19:22:23 +02:00
backref.h	Btrfs: fix regression in scrub path resolving	2012-03-27 14:51:21 +02:00
btrfs_inode.h
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
compat.h
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	Btrfs: avoid sleeping in verify_parent_transid while atomic	2012-05-06 07:23:47 -04:00
ctree.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-04-28 09:30:07 -07:00
delayed-inode.c	btrfs: replace many BUG_ONs with proper error handling	2012-03-22 11:52:54 +01:00
delayed-inode.h
delayed-ref.c	btrfs: return void in functions without error conditions	2012-03-22 01:45:34 +01:00
delayed-ref.h
dir-item.c	btrfs: replace many BUG_ONs with proper error handling	2012-03-22 11:52:54 +01:00
disk-io.c	Btrfs: avoid sleeping in verify_parent_transid while atomic	2012-05-06 07:23:47 -04:00
disk-io.h	Btrfs: avoid sleeping in verify_parent_transid while atomic	2012-05-06 07:23:47 -04: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: avoid sleeping in verify_parent_transid while atomic	2012-05-06 07:23:47 -04:00
extent_io.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-05-06 10:20:07 -07:00
extent_io.h	Btrfs: always store the mirror we read the eb from	2012-04-18 19:22:30 +02:00
extent_map.c
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: reduce lock contention during extent insertion	2012-04-27 14:51:05 -04: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
hash.h
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
inode.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-04-28 09:30:07 -07:00
ioctl.c	Btrfs: fix btrfs_ioctl_dev_info() crash on missing device	2012-04-18 19:22:35 +02:00
ioctl.h	btrfs: Fix mismatching struct members in ioctl.h	2012-05-04 15:16:06 -04:00
Kconfig
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
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
print-tree.h
reada.c	btrfs: don't add both copies of DUP to reada extent tree	2012-04-18 19:12:44 +02:00
relocation.c	Btrfs: Fix space checking during fs resize	2012-04-27 13:55:14 -04: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' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs	2012-05-06 10:20:07 -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-04-28 09:30:07 -07:00
sysfs.c
transaction.c	btrfs: add missing unlocks to transaction abort paths	2012-04-18 19:22:14 +02:00
transaction.h	btrfs: enhance transaction abort infrastructure	2012-03-22 01:45:40 +01:00
tree-defrag.c
tree-log.c	Btrfs: avoid sleeping in verify_parent_transid while atomic	2012-05-06 07:23:47 -04:00
tree-log.h	btrfs: return void in functions without error conditions	2012-03-22 01:45:34 +01:00
ulist.c
ulist.h
version.h
volumes.c	Btrfs: fix repair code for RAID10	2012-04-27 13:55:13 -04:00
volumes.h	btrfs: return void in functions without error conditions	2012-03-22 01:45:34 +01:00
xattr.c
xattr.h
zlib.c	btrfs: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:21 +08:00