mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
Merge branch 'for-4.10/fs-unmap' of git://git.kernel.dk/linux-block
Pull fs meta data unmap optimization from Jens Axboe: "A series from Jan Kara, providing a more efficient way for unmapping meta data from in the buffer cache than doing it block-by-block. Provide a general helper that existing callers can use" * 'for-4.10/fs-unmap' of git://git.kernel.dk/linux-block: fs: Remove unmap_underlying_metadata fs: Add helper to clean bdev aliases under a bh and use it ext2: Use clean_bdev_aliases() instead of iteration ext4: Use clean_bdev_aliases() instead of iteration direct-io: Use clean_bdev_aliases() instead of handmade iteration fs: Provide function to unmap metadata for a range of blocks
This commit is contained in:
commit
80eabba702
13 changed files with 104 additions and 95 deletions
|
|
@ -765,7 +765,7 @@ lock_retry_remap:
|
|||
}
|
||||
// TODO: Instantiate the hole.
|
||||
// clear_buffer_new(bh);
|
||||
// unmap_underlying_metadata(bh->b_bdev, bh->b_blocknr);
|
||||
// clean_bdev_bh_alias(bh);
|
||||
ntfs_error(vol->sb, "Writing into sparse regions is "
|
||||
"not supported yet. Sorry.");
|
||||
err = -EOPNOTSUPP;
|
||||
|
|
|
|||
|
|
@ -740,8 +740,7 @@ map_buffer_cached:
|
|||
set_buffer_uptodate(bh);
|
||||
if (unlikely(was_hole)) {
|
||||
/* We allocated the buffer. */
|
||||
unmap_underlying_metadata(bh->b_bdev,
|
||||
bh->b_blocknr);
|
||||
clean_bdev_bh_alias(bh);
|
||||
if (bh_end <= pos || bh_pos >= end)
|
||||
mark_buffer_dirty(bh);
|
||||
else
|
||||
|
|
@ -784,7 +783,7 @@ map_buffer_cached:
|
|||
continue;
|
||||
}
|
||||
/* We allocated the buffer. */
|
||||
unmap_underlying_metadata(bh->b_bdev, bh->b_blocknr);
|
||||
clean_bdev_bh_alias(bh);
|
||||
/*
|
||||
* If the buffer is fully outside the write, zero it,
|
||||
* set it uptodate, and mark it dirty so it gets
|
||||
|
|
|
|||
Loading…
Reference in a new issue