Linus Torvalds f7b0069317 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs ... Pull btrfs fixes from Chris Mason: "This has our collection of bug fixes. I missed the last rc because I thought our patches were making NFS crash during my xfs test runs. Turns out it was an NFS client bug fixed by someone else while I tried to bisect it. All of these fixes are small, but some are fairly high impact. The biggest are fixes for our mount -o remount handling, a deadlock due to GFP_KERNEL allocations in readdir, and a RAID10 error handling bug. This was tested against both 3.3 and Linus' master as of this morning." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (26 commits) Btrfs: reduce lock contention during extent insertion Btrfs: avoid deadlocks from GFP_KERNEL allocations during btrfs_real_readdir Btrfs: Fix space checking during fs resize Btrfs: fix block_rsv and space_info lock ordering Btrfs: Prevent root_list corruption Btrfs: fix repair code for RAID10 Btrfs: do not start delalloc inodes during sync Btrfs: fix that check_int_data mount option was ignored Btrfs: don't count CRC or header errors twice while scrubbing Btrfs: fix btrfs_ioctl_dev_info() crash on missing device btrfs: don't return EINTR Btrfs: double unlock bug in error handling Btrfs: always store the mirror we read the eb from fs/btrfs/volumes.c: add missing free_fs_devices btrfs: fix early abort in 'remount' Btrfs: fix max chunk size check in chunk allocator Btrfs: add missing read locks in backref.c Btrfs: don't call free_extent_buffer twice in iterate_irefs Btrfs: Make free_ipath() deal gracefully with NULL pointers Btrfs: avoid possible use-after-free in clear_extent_bit() ...		2012-04-28 09:30:07 -07:00
..
Kconfig	Btrfs: add config option to enable btrfs integrity check	2011-12-21 19:14:16 +01: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
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	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	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-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	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: always store the mirror we read the eb from	2012-04-18 19:22:30 +02: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	NFS support for btrfs - v3	2008-09-25 11:04:06 -04:00
extent-tree.c	Btrfs: fix block_rsv and space_info lock ordering	2012-04-27 13:55:14 -04:00
extent_io.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
extent_io.h	Btrfs: always store the mirror we read the eb from	2012-04-18 19:22:30 +02: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: 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	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-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: add balance progress reporting	2012-01-16 22:04:49 +02: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
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	Btrfs: Create extent_buffer interface for large blocksizes	2008-09-25 11:03:56 -04:00
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-04-28 09:30: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	btrfs: Remove unused sysfs code	2011-06-17 14:54:18 -04:00
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	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	Update Btrfs files for in-kernel usage	2008-09-25 15:41:59 -04:00
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	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