Btrfs cleanups for 4.11, part 2
David Sterba
maintainerHi,
this is the second half of the 4.11 batch, the rest of the cleanups. Please pull, thanks.
The following changes since commit 6288d6eabc7505f42dda34a2c2962f91914be3a4:
Btrfs: use the correct type when creating cow dio extent (2017-02-22 15:55:03 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-chris-4.11-part2
for you to fetch changes up to 20a7db8ab3f2057a518448b1728d504ffadef65e:
btrfs: add dummy callback for readpage_io_failed and drop checks (2017-02-28 14:29:24 +0100)
----------------------------------------------------------------
David Sterba (16):
btrfs: constify device path passed to relevant helpers
btrfs: constify input buffer of btrfs_csum_data
btrfs: constify buffers used by compression helpers
btrfs: constify name of subvolume in creation helpers
btrfs: merge length input and output parameter in compress_pages
btrfs: merge nr_pages input and output parameter in compress_pages
btrfs: export compression buffer limits in a header
btrfs: use predefined limits for calculating maximum number of pages for compression
btrfs: derive maximum output size in the compression implementation
btrfs: remove BUG_ON from __tree_mod_log_insert
btrfs: handle allocation error in update_dev_stat_item
btrfs: do proper error handling in btrfs_insert_xattr_item
btrfs: let writepage_end_io_hook return void
btrfs: document existence of extent_io ops callbacks
btrfs: drop checks for mandatory extent_io_ops callbacks
btrfs: add dummy callback for readpage_io_failed and drop checks
Nikolay Borisov (42):
btrfs: Make btrfs_log_all_parents take btrfs_inode
btrfs: Make btrfs_insert_dir_item take btrfs_inode
btrfs: make btrfs_set_inode_index_count take btrfs_inode
btrfs: Make btrfs_set_inode_index take btrfs_inode
btrfs: Make btrfs_i_size_write take btrfs_inode
btrfs: make btrfs_is_free_space_inode take btrfs_inode
btrfs: make btrfs_alloc_data_chunk_ondemand take btrfs_inode
btrfs: Make drop_outstanding_extent take btrfs_inode
btrfs: Make calc_csum_metadata_size take btrfs_inode
btrfs: Make btrfs_orphan_reserve_metadata take btrfs_inode
btrfs: Make btrfs_orphan_release_metadata take btrfs_inode
btrfs: Make btrfs_delalloc_reserve_metadata take btrfs_inode
btrfs: all btrfs_delalloc_release_metadata take btrfs_inode
btrfs: Make (__)btrfs_add_inode_defrag take btrfs_inode
btrfs: Make btrfs_requeue_inode_defrag take btrfs_inode
btrfs: Make btrfs_drop_extent_cache take btrfs_inode
btrfs: Make hole_mergeable take btrfs_inode
btrfs: Make fill_holes take btrfs_inode
btrfs: Make btrfs_mark_extent_written take btrfs_inode
btrfs: Make btrfs_lookup_ordered_range take btrfs_inode
btrfs: Make check_can_nocow take btrfs_inode
btrfs: Make lock_and_cleanup_extent_if_need take btrfs_inode
btrfs: make free_io_failure take btrfs_inode
btrfs: make btrfs_print_data_csum_error take btrfs_inode
btrfs: make check_compressed_csum take btrfs_inode
btrfs: make repair_io_failure take btrfs_inode
btrfs: make clean_io_failure take btrfs_inode
btrfs: make btrfs_free_io_failure_record take btrfs_inode
btrfs: make btrfs_orphan_del take btrfs_inode
btrfs: Make btrfs_orphan_add take btrfs_inode
btrfs: Make check_parent_dirs_for_sync take btrfs_inode
btrfs: make btrfs_log_inode_parent take btrfs_inode
btrfs: Make btrfs_extent_item_to_extent_map take btrfs_inode
btrfs: Make btrfs_clear_bit_hook take btrfs_inode
btrfs: Make clone_update_extent_map take btrfs_inode
btrfs: Make check_extent_to_block take btrfs_inode
btrfs: Make get_extent_t take btrfs_inode
btrfs: Make btrfs_del_delalloc_inode take btrfs_inode
btrfs: Make btrfs_add_link take btrfs_inode
btrfs: Make btrfs_add_nondir take btrfs_inode
btrfs: make btrfs_inode_block_unlocked_dio take btrfs_inode
btrfs: make btrfs_inode_resume_unlocked_dio take btrfs_inode
fs/btrfs/btrfs_inode.h | 31 ++-- fs/btrfs/compression.c | 43 ++--- fs/btrfs/compression.h | 30 ++-- fs/btrfs/ctree.c | 2 - fs/btrfs/ctree.h | 39 ++-- fs/btrfs/delayed-inode.c | 2 +- fs/btrfs/dev-replace.c | 5 +- fs/btrfs/dev-replace.h | 5 +- fs/btrfs/dir-item.c | 9 +- fs/btrfs/disk-io.c | 17 +- fs/btrfs/disk-io.h | 2 +- fs/btrfs/extent-tree.c | 135 +++++++------- fs/btrfs/extent_io.c | 75 ++++---- fs/btrfs/extent_io.h | 50 ++++-- fs/btrfs/file-item.c | 12 +- fs/btrfs/file.c | 139 ++++++++------- fs/btrfs/free-space-cache.c | 5 +- fs/btrfs/inode-map.c | 2 +- fs/btrfs/inode.c | 416 ++++++++++++++++++++++--------------------- fs/btrfs/ioctl.c | 38 ++-- fs/btrfs/lzo.c | 12 +- fs/btrfs/ordered-data.c | 9 +- fs/btrfs/ordered-data.h | 7 +- fs/btrfs/relocation.c | 17 +- fs/btrfs/scrub.c | 11 +- fs/btrfs/tests/inode-tests.c | 46 ++--- fs/btrfs/transaction.c | 6 +- fs/btrfs/tree-log.c | 92 +++++----- fs/btrfs/volumes.c | 21 ++- fs/btrfs/volumes.h | 12 +- fs/btrfs/zlib.c | 9 +- 31 files changed, 673 insertions(+), 626 deletions(-)
Quoted 9 lines · David Sterba
Hi,
this is the second half of the 4.11 batch, the rest of the cleanups. Please pull, thanks.
The following changes since commit
6288d6eabc7505f42dda34a2c2962f91914be3a4:Btrfs: use the correct type when creating cow dio extent (2017-02-22 15:55:03 -0800)
Quoted 8 lines
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.gitfor-chris-4.11-part2for you to fetch changes up to
20a7db8ab3f2057a518448b1728d504ffadef65e:btrfs: add dummy callback for
readpage_io_failedand drop checks (2017-02-28 14:29:24 +0100)
Thanks Dave, I've got this along with Filipe's pull.
-chris
Quoted 20 lines · Chris Mason
Quoted 17 lines · David Sterba
Hi,
this is the second half of the 4.11 batch, the rest of the cleanups. Please
pull, thanks.The following changes since commit
6288d6eabc7505f42dda34a2c2962f91914be3a4:Btrfs: use the correct type when creating cow dio extent (2017-02-22
15:55:03 -0800)are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git
for-chris-4.11-part2
Quoted 7 lines
Quoted 5 lines
for you to fetch changes up to
20a7db8ab3f2057a518448b1728d504ffadef65e:btrfs: add dummy callback for
readpage_io_failedand drop checks
(2017-02-28 14:29:24 +0100)Thanks Dave, I've got this along with Filipe's pull.
Kbuild reported the following warning:
fs/btrfs/scrub.c: In function 'check_extent_to_block':
Quoted 1 line
Quoted 1 line
fs/btrfs/scrub.c:4259:24: error: passing argument 1 of 'btrfs_get_extent' from incompatible pointer type [-Werror=incompatible-pointer-types]
em = btrfs_get_extent(inode, NULL, 0, start, len, 0);
^~~~~ In file included from fs/btrfs/scrub.c:21:0:
fs/btrfs/ctree.h:3169:20: note: expected 'struct inode *' but argument is of type 'struct btrfs_inode *'
struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page,
^~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
vim +/btrfs_get_extent +4259 fs/btrfs/scrub.c
32159242 Gui Hecheng 2014-11-10 4253 if (ordered) {
32159242 Gui Hecheng 2014-11-10 4254 btrfs_put_ordered_extent(ordered);
32159242 Gui Hecheng 2014-11-10 4255 ret = 1;
32159242 Gui Hecheng 2014-11-10 4256 goto out_unlock;
32159242 Gui Hecheng 2014-11-10 4257 }
32159242 Gui Hecheng 2014-11-10 4258
32159242 Gui Hecheng 2014-11-10 @4259 em = btrfs_get_extent(inode, NULL, 0, start, len, 0);
32159242 Gui Hecheng 2014-11-10 4260 if (IS_ERR(em)) {
32159242 Gui Hecheng 2014-11-10 4261 ret = PTR_ERR(em);
32159242 Gui Hecheng 2014-11-10 4262 goto out_unlock;I guess changing the definition of btrfs_get_extent in ctree.h got missed to being converted to struct btrfs_inode. Could you be able to fix it up?
Quoted 8 lines
-chris
Signature · 3 lines
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 25 lines · Nikolay Borisov
Kbuildreported the following warning:
fs/btrfs/scrub.c: In function 'check_extent_to_block':Quoted 1 line
Quoted 1 line
fs/btrfs/scrub.c:4259:24: error: passing argument 1 of 'btrfs_get_extent' from incompatible pointer type [-Werror=incompatible-pointer-types]em = btrfs_get_extent(inode, NULL, 0, start, len, 0); ^~~~~In file included from
fs/btrfs/scrub.c:21:0:
fs/btrfs/ctree.h:3169:20: note: expected 'struct inode *' but argument is of type 'structbtrfs_inode*'
structextent_map*btrfs_get_extent(struct inode *inode, struct page *page,
^~~~~~~~~~~~~~~~
cc1: some warnings being treated as errorsvim +/btrfs_get_extent +4259
fs/btrfs/scrub.c32159242 Gui Hecheng 2014-11-10 4253 if (ordered) { 32159242 Gui Hecheng 2014-11-10 4254 btrfs_put_ordered_extent(ordered); 32159242 Gui Hecheng 2014-11-10 4255 ret = 1; 32159242 Gui Hecheng 2014-11-10 4256 goto out_unlock; 32159242 Gui Hecheng 2014-11-10 4257 } 32159242 Gui Hecheng 2014-11-10 4258 32159242 Gui Hecheng 2014-11-10 @4259 em = btrfs_get_extent(inode, NULL, 0, start, len, 0); 32159242 Gui Hecheng 2014-11-10 4260 if (IS_ERR(em)) { 32159242 Gui Hecheng 2014-11-10 4261 ret = PTR_ERR(em); 32159242 Gui Hecheng 2014-11-10 4262 goto out_unlock;
Quoted 2 lines
I guess changing the definition of
btrfs_get_extentinctree.hgot missed to being converted to structbtrfs_inode. Could you be able to fix it up?
Seems the problem got fixed by some following patch. The exact commit 1c8c9c5216295711c79 fails to build but the whole branch is ok. As it's a minor annoyance I'd rather skip redoing the pull request.