| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 12 Feb 2016 17:21:28 +0000 (09:21 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 12 Feb 2016 17:21:28 +0000 (09:21 -0800) | ||
| commit | 27c9d772e50731dfd682b4ea9459eccec2071c49 | |
| tree | 56c526d690e7248662bc70cd32159cf59e21bced | tree | snapshot (tar.xz tar.gz zip) |
| parent | dfc852864d747289d7ed393aab337637eda007be | commit | diff |
| parent | bc4ef7592f657ae81b017207a1098817126ad4cb | commit | diff |
Merge branch 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"This has a few fixes from Filipe, along with a readdir fix from Dave
that we've been testing for some time"
* 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
btrfs: properly set the termination value of ctx->pos in readdir
Btrfs: fix hang on extent buffer lock caused by the inode_paths ioctl
Btrfs: remove no longer used function extent_read_full_page_nolock()
Btrfs: fix page reading in extent_same ioctl leading to csum errors
Btrfs: fix invalid page accesses in extent_same (dedup) ioctl
Pull btrfs fixes from Chris Mason:
"This has a few fixes from Filipe, along with a readdir fix from Dave
that we've been testing for some time"
* 'for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
btrfs: properly set the termination value of ctx->pos in readdir
Btrfs: fix hang on extent buffer lock caused by the inode_paths ioctl
Btrfs: remove no longer used function extent_read_full_page_nolock()
Btrfs: fix page reading in extent_same ioctl leading to csum errors
Btrfs: fix invalid page accesses in extent_same (dedup) ioctl
| fs/btrfs/inode.c | diff1 | | diff2 | | blob | history |
| fs/btrfs/ioctl.c | diff1 | | diff2 | | blob | history |