| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 18 Dec 2015 23:35:08 +0000 (15:35 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 18 Dec 2015 23:35:08 +0000 (15:35 -0800) | ||
| commit | fc315e3e5c9418df6ce5cee97fd4adcce9dcf24e | |
| tree | 16843039ea2efa2504b495d0a168d0b5a834aec3 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 8b4414f51d098ca6f9fa3c6b6b31926f3b45d4bc | commit | diff |
| parent | 1d3a5a82fe724c53c472a18a31fb0bbf33dfaba2 | commit | diff |
Merge branch 'for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"A couple of small fixes"
* 'for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: check prepare_uptodate_page() error code earlier
Btrfs: check for empty bitmap list in setup_cluster_bitmaps
btrfs: fix misleading warning when space cache failed to load
Btrfs: fix transaction handle leak in balance
Btrfs: fix unprotected list move from unused_bgs to deleted_bgs list
Pull btrfs fixes from Chris Mason:
"A couple of small fixes"
* 'for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: check prepare_uptodate_page() error code earlier
Btrfs: check for empty bitmap list in setup_cluster_bitmaps
btrfs: fix misleading warning when space cache failed to load
Btrfs: fix transaction handle leak in balance
Btrfs: fix unprotected list move from unused_bgs to deleted_bgs list
| fs/btrfs/file.c | diff1 | | diff2 | | blob | history |
| fs/btrfs/free-space-cache.c | diff1 | | diff2 | | blob | history |
| fs/btrfs/volumes.c | diff1 | | diff2 | | blob | history |