diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-24 07:17:58 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-24 07:17:58 +0900 |
| commit | 37902bc190f1396a8c232783b29ddfcaa4026028 (patch) | |
| tree | bb13b0d32a6509c935d60af64adc9a86308c0619 /fs/btrfs/locking.c | |
| parent | 03867292476e6fa7679395838d768dda0a0816c7 (diff) | |
| parent | 0f89abf56abbd0e1c6e3cef9813e6d9f05383c1e (diff) | |
Merge branch 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"I have two more small fixes this week:
Qu's fix avoids unneeded COW during fallocate, and Christian found a
memory leak in the error handling of an earlier fix"
* 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
btrfs: fix possible leak in btrfs_ioctl_balance()
btrfs: Avoid truncate tailing page if fallocate range doesn't exceed inode size
Diffstat (limited to 'fs/btrfs/locking.c')
0 files changed, 0 insertions, 0 deletions