diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-01 17:46:21 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-01 17:46:21 +0300 |
| commit | 64887b6882de36069c18ef2d9623484d6db7cd3a (patch) | |
| tree | f19394feffe73007751161c98bf44ecfac16f5d2 /fs/ocfs2/Makefile | |
| parent | 036f351e2566eaa5826581c8512dd55f6585ad01 (diff) | |
| parent | 5d2361db48899789fb466ff62db5d5fc7b070e86 (diff) | |
| download | linux-64887b6882de36069c18ef2d9623484d6db7cd3a.tar.xz | |
Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"A few more btrfs fixes.
These range from corners Filipe found in the new free space cache
writeback to a grab bag of fixes from the list"
* 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: btrfs_release_extent_buffer_page didn't free pages of dummy extent
Btrfs: fill ->last_trans for delayed inode in btrfs_fill_inode.
btrfs: unlock i_mutex after attempting to delete subvolume during send
btrfs: check io_ctl_prepare_pages return in __btrfs_write_out_cache
btrfs: fix race on ENOMEM in alloc_extent_buffer
btrfs: handle ENOMEM in btrfs_alloc_tree_block
Btrfs: fix find_free_dev_extent() malfunction in case device tree has hole
Btrfs: don't check for delalloc_bytes in cache_save_setup
Btrfs: fix deadlock when starting writeback of bg caches
Btrfs: fix race between start dirty bg cache writeout and bg deletion
Diffstat (limited to 'fs/ocfs2/Makefile')
0 files changed, 0 insertions, 0 deletions