| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 8 Feb 2013 01:06:46 +0000 (12:06 +1100) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 8 Feb 2013 01:06:46 +0000 (12:06 +1100) | ||
| commit | 8d19514fade54798106a60059c539501eda31b47 | |
| tree | 737e9fc90b37bec251cfb2bf36bf056200d6e596 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 95436adaa0f97e42e89978690c3a79cf9ef0d486 | commit | diff |
| parent | 1a65e24b0bb7dde48cac4a2bf74d5558f9e32ba7 | commit | diff |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"We've got corner cases for updating i_size that ceph was hitting,
error handling for quotas when we run out of space, a very subtle
snapshot deletion race, a crash while removing devices, and one
deadlock between subvolume creation and the sb_internal code (thanks
lockdep)."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: move d_instantiate outside the transaction during mksubvol
Btrfs: fix EDQUOT handling in btrfs_delalloc_reserve_metadata
Btrfs: fix possible stale data exposure
Btrfs: fix missing i_size update
Btrfs: fix race between snapshot deletion and getting inode
Btrfs: fix missing release of the space/qgroup reservation in start_transaction()
Btrfs: fix wrong sync_writers decrement in btrfs_file_aio_write()
Btrfs: do not merge logged extents if we've removed them from the tree
btrfs: don't try to notify udev about missing devices
Pull btrfs fixes from Chris Mason:
"We've got corner cases for updating i_size that ceph was hitting,
error handling for quotas when we run out of space, a very subtle
snapshot deletion race, a crash while removing devices, and one
deadlock between subvolume creation and the sb_internal code (thanks
lockdep)."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: move d_instantiate outside the transaction during mksubvol
Btrfs: fix EDQUOT handling in btrfs_delalloc_reserve_metadata
Btrfs: fix possible stale data exposure
Btrfs: fix missing i_size update
Btrfs: fix race between snapshot deletion and getting inode
Btrfs: fix missing release of the space/qgroup reservation in start_transaction()
Btrfs: fix wrong sync_writers decrement in btrfs_file_aio_write()
Btrfs: do not merge logged extents if we've removed them from the tree
btrfs: don't try to notify udev about missing devices
| fs/btrfs/extent-tree.c | diff1 | | diff2 | | blob | history |
| fs/btrfs/extent_map.c | diff1 | | diff2 | | blob | history |
| fs/btrfs/file.c | diff1 | | diff2 | | blob | history |
| fs/btrfs/ioctl.c | diff1 | | diff2 | | blob | history |