linux-next: manual merge of the btrfs tree with the btrfs-fixes tree
Subsystems (2)
Mark Brown
maintainerHi all,
Today's linux-next merge of the btrfs tree got a conflict in:
fs/btrfs/tree-log.c
between commit:
5254d4181add9 ("btrfs: fix zero size inode with non-zero size after log replay")
from the btrfs-fixes tree and commits:
5ff218f0ce4bf ("btrfs: pass a btrfs inode to tree-log.c:fill_inode_item()") b665ca59560b5 ("btrfs: fix zero size inode with non-zero size after log replay")
from the btrfs tree.
I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
fs/btrfs/tree-log.c +0 -0
@@@ -457,7 -457,7 +457,7 @@@ static int process_one_buffer(struct exreturn ret; } - if (btrfs_buffer_uptodate(eb, gen, false) && level == 0) { +if (btrfs_buffer_uptodate(eb, gen, NULL) && level == 0) { ret = btrfs_exclude_logged_extents(eb); if (ret) btrfs_abort_transaction(trans, ret); btrfs_root_id(root)); } if (!ret) { -ret = btrfs_csum_file_blocks(trans, csum_root, sums); +ret = btrfs_insert_data_csums(trans, csum_root, sums); if (ret) btrfs_abort_log_replay(wc, ret, "failed to add csums for range [%llu, %llu) inode %llu root %llu", } /* insert our name */ - ret =btrfs_add_link (trans, dir, inode, &name,0 , ref_index); + ret =btrfs_add_link (trans, dir, inode, &name, false, ref_index);if (ret) {btrfs_abort_log_replay (wc, ret,"failed to add link for inode %llu in dir %llu ref_index %llu name %.*s root %llu" , return PTR_ERR(dir); } - ret =btrfs_add_link (trans, dir, inode, name,1 , index); + ret =btrfs_add_link (trans, dir, inode, name, true, index);/* FIXME, put inode into FIXUP list */ btrfs_set_super_log_root (fs_info->super_for_commit, log_root_start);btrfs_set_super_log_root_level (fs_info->super_for_commit, log_root_level); - ret =write_all_supers (fs_info,1 ); + ret =write_all_supers (trans);mutex_unlock (&fs_info->tree_log_mutex);if (unlikely (ret)) {btrfs_set_log_full_commit (trans);static void fill_inode_item (struct btrfs_trans_handle *trans,struct extent_buffer *leaf,struct btrfs_inode_item *item, -struct inode *inode,bool log_inode_only, +struct btrfs_inode *inode,bool log_inode_only,u64 logged_isize) { -u64 gen =BTRFS_I (inode)->generation; +struct inode *vfs_inode = &inode->vfs_inode; +u64 gen = inode->generation;u64 flags;if (log_inode_only) { * and one can set it to 0 since that only happens on eviction * and we are holding a ref on the inode. */ - ASSERT(data_race(BTRFS_I(inode)->logged_trans) > 0); -if (data_race (BTRFS_I (inode)->logged_trans) < trans->transid) + ASSERT(data_race(inode->logged_trans) > 0); +if (data_race (inode->logged_trans) < trans->transid) gen =0 ;btrfs_set_inode_size (leaf, item, logged_isize); }else { -btrfs_set_inode_size (leaf, item, inode->i_size); +btrfs_set_inode_size (leaf, item, vfs_inode->i_size); }btrfs_set_inode_generation (leaf, item, gen); -btrfs_set_inode_uid (leaf, item,i_uid_read (inode)); -btrfs_set_inode_gid (leaf, item,i_gid_read (inode)); -btrfs_set_inode_mode (leaf, item, inode->i_mode); -btrfs_set_inode_nlink (leaf, item, inode->i_nlink); +btrfs_set_inode_uid (leaf, item,i_uid_read (vfs_inode)); +btrfs_set_inode_gid (leaf, item,i_gid_read (vfs_inode)); +btrfs_set_inode_mode (leaf, item, vfs_inode->i_mode); +btrfs_set_inode_nlink (leaf, item, vfs_inode->i_nlink); -btrfs_set_timespec_sec (leaf, &item->atime,inode_get_atime_sec (inode)); -btrfs_set_timespec_nsec (leaf, &item->atime,inode_get_atime_nsec (inode)); +btrfs_set_timespec_sec (leaf, &item->atime,inode_get_atime_sec (vfs_inode)); +btrfs_set_timespec_nsec (leaf, &item->atime,inode_get_atime_nsec (vfs_inode)); -btrfs_set_timespec_sec (leaf, &item->mtime,inode_get_mtime_sec (inode)); -btrfs_set_timespec_nsec (leaf, &item->mtime,inode_get_mtime_nsec (inode)); +btrfs_set_timespec_sec (leaf, &item->mtime,inode_get_mtime_sec (vfs_inode)); +btrfs_set_timespec_nsec (leaf, &item->mtime,inode_get_mtime_nsec (vfs_inode)); -btrfs_set_timespec_sec (leaf, &item->ctime,inode_get_ctime_sec (inode)); -btrfs_set_timespec_nsec (leaf, &item->ctime,inode_get_ctime_nsec (inode)); +btrfs_set_timespec_sec (leaf, &item->ctime,inode_get_ctime_sec (vfs_inode)); +btrfs_set_timespec_nsec (leaf, &item->ctime,inode_get_ctime_nsec (vfs_inode)); -btrfs_set_timespec_sec (leaf, &item->otime,BTRFS_I (inode)->i_otime_sec); -btrfs_set_timespec_nsec (leaf, &item->otime,BTRFS_I (inode)->i_otime_nsec); +btrfs_set_timespec_sec (leaf, &item->otime, inode->i_otime_sec); +btrfs_set_timespec_nsec (leaf, &item->otime, inode->i_otime_nsec);/* * We do not need to set the nbytes field, in fact during a fast fsync * inode item in subvolume tree as needed (see overwrite_item()). */ -btrfs_set_inode_sequence (leaf, item,inode_peek_iversion (inode)); +btrfs_set_inode_sequence (leaf, item,inode_peek_iversion (vfs_inode));btrfs_set_inode_transid (leaf, item, trans->transid); -btrfs_set_inode_rdev (leaf, item, inode->i_rdev); - flags =btrfs_inode_combine_flags (BTRFS_I (inode)->flags, -BTRFS_I (inode)->ro_flags); +btrfs_set_inode_rdev (leaf, item, vfs_inode->i_rdev); + flags =btrfs_inode_combine_flags (inode->flags, inode->ro_flags);btrfs_set_inode_flags (leaf, item, flags);btrfs_set_inode_block_group (leaf, item,0 ); }return ret; inode_item =btrfs_item_ptr (path->nodes[0 ], path->slots[0 ], struct btrfs_inode_item); -fill_inode_item (trans, path->nodes[0 ], inode_item, &inode->vfs_inode, - false,0 ); +fill_inode_item (trans, path->nodes[0 ], inode_item, inode, false,0 );btrfs_release_path (path);return 0 ; } * worry about logging checksum items with overlapping ranges. */if (inode->last_reflink_trans < trans->transid) -return btrfs_csum_file_blocks (trans, log_root, sums); +return btrfs_insert_data_csums (trans, log_root, sums);/* * Serialize logging for checksums. This is to avoid racing with the */ ret =btrfs_del_csums (trans, log_root, sums->logical, sums->len);if (!ret) - ret =btrfs_csum_file_blocks (trans, log_root, sums); + ret =btrfs_insert_data_csums (trans, log_root, sums);btrfs_unlock_extent (&log_root->log_csum_range, sums->logical, lock_end, &cached_state); inode_item =btrfs_item_ptr (dst_path->nodes[0 ], dst_slot, struct btrfs_inode_item);fill_inode_item (trans, dst_path->nodes[0 ], inode_item, - &inode->vfs_inode, - inode_only ==LOG_INODE_EXISTS , + inode, inode_only ==LOG_INODE_EXISTS , logged_isize); }else { copy_extent_buffer(dst_path->nodes[0], src, dst_offset, if (test_and_set_bit(BTRFS_ORDERED_LOGGED_CSUM, &ordered->flags)) continue; - list_for_each_entry(sums, &ordered->list, list) { + list_for_each_entry(sums, &ordered->csum_list, list) { ret = log_csums(trans, inode, log_root, sums); if (ret) return ret; name_str.len = this_name_len; di = btrfs_lookup_dir_item(NULL, inode->root, search_path, parent, &name_str, 0); - if (di && !IS_ERR(di)) { + if (!IS_ERR_OR_NULL(di)) { struct btrfs_key di_key; btrfs_dir_item_key_to_cpu(search_path->nodes[0],