diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-15 07:23:00 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-15 07:23:00 +0900 |
| commit | e7655d2b25466c534ed1f539367dae595bb0bd20 (patch) | |
| tree | a6d6c0fdfdca3a960c6dda65e2cff7684027c4c7 /net/ceph | |
| parent | d148eac0e70f06485dbd4cce6ed01cb07c650cec (diff) | |
| parent | ac0b4145d662a3b9e34085dea460fb06ede9b69b (diff) | |
| download | linux-e7655d2b25466c534ed1f539367dae595bb0bd20.tar.bz2 | |
Merge tag 'for-4.18-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
- error handling fixup for one of the new ioctls from 1st pull
- fix for device-replace that incorrectly uses inode pages and can mess
up compressed extents in some cases
- fiemap fix for reporting incorrect number of extents
- vm_fault_t type conversion
* tag 'for-4.18-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: scrub: Don't use inode pages for device replace
btrfs: change return type of btrfs_page_mkwrite to vm_fault_t
Btrfs: fiemap: pass correct bytenr when fm_extent_count is zero
btrfs: Check error of btrfs_iget in btrfs_search_path_in_tree_user
Diffstat (limited to 'net/ceph')
0 files changed, 0 insertions, 0 deletions