btrfs: clean up chained assignments
David Sterba
maintainerPATCH 1/1 btrfs: clean up chained assignments
The chained assignments may be convenient to write, but make readability a bit worse as it's too easy to overlook that there are several values set on the same line while this is rather an exception. Making it consistent everywhere avoids surprises.
The pattern where inode times are initialized reuses the first value and the order is mtime, ctime. In other blocks the assignments are expanded so the order of variables is similar to the neighboring code.
Signed-off-by David Sterba <[email protected]>
--- fs/btrfs/dev-replace.c | 3 +- fs/btrfs/file.c | 9 ++++-- fs/btrfs/free-space-cache.c | 3 +- fs/btrfs/inode.c | 41 ++++++++++++++++++---------- fs/btrfs/reflink.c | 6 ++-- fs/btrfs/tests/extent-buffer-tests.c | 3 +- fs/btrfs/transaction.c | 4 +-- fs/btrfs/volumes.c | 3 +- 8 files changed, 46 insertions(+), 26 deletions(-)
fs/btrfs/dev-replace.c +2 -1
@@ -587,7 +587,8 @@ bool btrfs_finish_block_group_to_copy(struct btrfs_device *srcdev,ASSERT (!IS_ERR (em)); map = em->map_lookup; - num_extents = cur_extent =0 ; + num_extents =0 ; + cur_extent =0 ;for (i =0 ; i < map->num_stripes; i++) {/* We have more device extent to copy */ if (srcdev != map->stripes[i].dev)
fs/btrfs/file.c +6 -3
@@ -2058,9 +2058,11 @@ ssize_t btrfs_do_write_iter(struct kiocb *iocb, struct iov_iter *from, num_written =btrfs_encoded_write (iocb, from, encoded); num_sync = encoded->len; }else if (iocb->ki_flags &IOCB_DIRECT ) { - num_written = num_sync =btrfs_direct_write (iocb, from); + num_written =btrfs_direct_write (iocb, from); + num_sync = num_written; }else { - num_written = num_sync =btrfs_buffered_write (iocb, from); + num_written =btrfs_buffered_write (iocb, from); + num_sync = num_written; }btrfs_set_inode_last_sub_trans (inode);
@@ -3100,7 +3102,8 @@ static int btrfs_punch_hole(struct file *file, loff_t offset, loff_t len)ASSERT (trans !=NULL );inode_inc_iversion (inode); - inode->i_mtime = inode->i_ctime =current_time (inode); + inode->i_mtime =current_time (inode); + inode->i_ctime = inode->i_mtime; ret =btrfs_update_inode (trans, root,BTRFS_I (inode)); updated_inode = true;btrfs_end_transaction (trans);
fs/btrfs/free-space-cache.c +2 -1
@@ -3536,7 +3536,8 @@ int btrfs_find_space_cluster(struct btrfs_block_group *block_group,* data, keep it dense. */ if (btrfs_test_opt (fs_info,SSD_SPREAD )) { - cont1_bytes = min_bytes = bytes + empty_size; + cont1_bytes = bytes + empty_size; + min_bytes = cont1_bytes; }else if (block_group->flags &BTRFS_BLOCK_GROUP_METADATA ) { cont1_bytes = bytes; min_bytes = fs_info->sectorsize;
fs/btrfs/inode.c +26 -15
89 lines not on this page · raw message
fs/btrfs/reflink.c +4 -2
@@ -23,8 +23,10 @@ static int clone_finish_inode_update(struct btrfs_trans_handle *trans,int ret;inode_inc_iversion (inode); -if (!no_time_update) - inode->i_mtime = inode->i_ctime =current_time (inode); +if (!no_time_update) { + inode->i_mtime =current_time (inode); + inode->i_ctime = inode->i_mtime; + }/* * We round up to the block size at eof when determining which * extents to clone above, but shouldn't round up the file size.
fs/btrfs/tests/extent-buffer-tests.c +2 -1
@@ -47,7 +47,8 @@ static int test_btrfs_split_item(u32 sectorsize, u32 nodesize) goto out; } - path->nodes[0 ] = eb =alloc_dummy_extent_buffer (fs_info, nodesize); + eb =alloc_dummy_extent_buffer (fs_info, nodesize); + path->nodes[0 ] = eb;if (!eb) {test_std_err (TEST_ALLOC_EXTENT_BUFFER ); ret = -ENOMEM ;
fs/btrfs/transaction.c +2 -2
@@ -1818,8 +1818,8 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans,btrfs_i_size_write (BTRFS_I (parent_inode), parent_inode->i_size + dentry->d_name.len *2 ); - parent_inode->i_mtime = parent_inode->i_ctime = -current_time (parent_inode); + parent_inode->i_mtime =current_time (parent_inode); + parent_inode->i_ctime = parent_inode->i_mtime; ret =btrfs_update_inode_fallback (trans, parent_root,BTRFS_I (parent_inode));if (ret) {btrfs_abort_transaction (trans, ret);
fs/btrfs/volumes.c +2 -1
@@ -7211,7 +7211,8 @@ static int read_one_dev(struct extent_buffer *leaf,u8 fs_uuid[BTRFS_FSID_SIZE ];u8 dev_uuid[BTRFS_UUID_SIZE ]; - devid = args.devid =btrfs_device_id (leaf, dev_item); + devid =btrfs_device_id (leaf, dev_item); + args.devid = devid;read_extent_buffer (leaf, dev_uuid,btrfs_device_uuid (dev_item),BTRFS_UUID_SIZE ); read_extent_buffer(leaf, fs_uuid, btrfs_device_fsid(dev_item),
Signature · 1 line
2.36.1