[PATCH 0/3] Remove uneeded variable "err"

[PATCH 0/3] Remove uneeded variable "err"

[zhong jiang]

zhong jiang (3):
  fs/btrfs/disk-io: Remove unneeded variable "err"
  fs/btrfs/extent-tree: remove redudant variable "err"
  fs/btrfs/tree-log: remove the unneeded variable "err"

 fs/btrfs/disk-io.c     | 12 ++++--------
 fs/btrfs/extent-tree.c |  6 ++----
 fs/btrfs/tree-log.c    |  5 +----
 fs/btrfs/tree-log.h    |  2 +-
 4 files changed, 8 insertions(+), 17 deletions(-)

-- 
1.7.12.4

[PATCH 1/3] fs/btrfs/disk-io: Remove unneeded variable "err"

[zhong jiang]

The err is not used after initalization, So remove it and make
the function to be void function.

Signed-off-by: zhong jiang <zhongjiang@huawei.com>
---
 fs/btrfs/disk-io.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 468365d..34e4926 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -53,8 +53,8 @@
 static const struct extent_io_ops btree_extent_io_ops;
 static void end_workqueue_fn(struct btrfs_work *work);
 static void btrfs_destroy_ordered_extents(struct btrfs_root *root);
-static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
-				      struct btrfs_fs_info *fs_info);
+static void btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
+				       struct btrfs_fs_info *fs_info);
 static void btrfs_destroy_delalloc_inodes(struct btrfs_root *root);
 static int btrfs_destroy_marked_extents(struct btrfs_fs_info *fs_info,
 					struct extent_io_tree *dirty_pages,
@@ -4179,13 +4179,12 @@ static void btrfs_destroy_all_ordered_extents(struct btrfs_fs_info *fs_info)
 	spin_unlock(&fs_info->ordered_root_lock);
 }
 
-static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
-				      struct btrfs_fs_info *fs_info)
+static void btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
+				       struct btrfs_fs_info *fs_info)
 {
 	struct rb_node *node;
 	struct btrfs_delayed_ref_root *delayed_refs;
 	struct btrfs_delayed_ref_node *ref;
-	int ret = 0;
 
 	delayed_refs = &trans->delayed_refs;
 
@@ -4193,7 +4192,6 @@ static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
 	if (atomic_read(&delayed_refs->num_entries) == 0) {
 		spin_unlock(&delayed_refs->lock);
 		btrfs_info(fs_info, "delayed_refs has NO entry");
-		return ret;
 	}
 
 	while ((node = rb_first(&delayed_refs->href_root)) != NULL) {
@@ -4247,8 +4245,6 @@ static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
 	}
 
 	spin_unlock(&delayed_refs->lock);
-
-	return ret;
 }
 
 static void btrfs_destroy_delalloc_inodes(struct btrfs_root *root)
-- 
1.7.12.4

Re: [PATCH 1/3] fs/btrfs/disk-io: Remove unneeded variable "err"

[Joe Perches]

On Sun, 2018-08-05 at 23:02 +0800, zhong jiang wrote:
> The err is not used after initalization, So remove it and make
> the function to be void function.
[]
> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
[]
> @@ -4193,7 +4192,6 @@ static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
>  	if (atomic_read(&delayed_refs->num_entries) == 0) {
>  		spin_unlock(&delayed_refs->lock);
>  		btrfs_info(fs_info, "delayed_refs has NO entry");
> -		return ret;

Think a little more about this please.
This is not a sensible removal.

>  	}
>  
>  	while ((node = rb_first(&delayed_refs->href_root)) != NULL) {

Re: [PATCH 1/3] fs/btrfs/disk-io: Remove unneeded variable "err"

[zhong jiang]

On 2018/8/5 23:27, Joe Perches wrote:
> On Sun, 2018-08-05 at 23:02 +0800, zhong jiang wrote:
>> The err is not used after initalization, So remove it and make
>> the function to be void function.
> []
>> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
> []
>> @@ -4193,7 +4192,6 @@ static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
>>  	if (atomic_read(&delayed_refs->num_entries) == 0) {
>>  		spin_unlock(&delayed_refs->lock);
>>  		btrfs_info(fs_info, "delayed_refs has NO entry");
>> -		return ret;
> Think a little more about this please.
> This is not a sensible removal.
 I am sorry for stupid mistake.  I  will repost.

Thanks,
zhong jiang
>>  	}
>>  
>>  	while ((node = rb_first(&delayed_refs->href_root)) != NULL) {
>
> .
>

Re: [PATCH 1/3] fs/btrfs/disk-io: Remove unneeded variable "err"

[Nikolay Borisov]

On  5.08.2018 18:02, zhong jiang wrote:
> The err is not used after initalization, So remove it and make
> the function to be void function.
> 
> Signed-off-by: zhong jiang <zhongjiang@huawei.com>

The ret value of this function is not checked by the sole caller
(btrfs_cleanup_one_transaction), however, this does not give you the
right to use a bulk commit message. If you want your future
contributions to be taken seriously please put actual effort in properly
describing your changes.


> ---
>  fs/btrfs/disk-io.c | 12 ++++--------
>  1 file changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
> index 468365d..34e4926 100644
> --- a/fs/btrfs/disk-io.c
> +++ b/fs/btrfs/disk-io.c
> @@ -53,8 +53,8 @@
>  static const struct extent_io_ops btree_extent_io_ops;
>  static void end_workqueue_fn(struct btrfs_work *work);
>  static void btrfs_destroy_ordered_extents(struct btrfs_root *root);
> -static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
> -				      struct btrfs_fs_info *fs_info);
> +static void btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
> +				       struct btrfs_fs_info *fs_info);
>  static void btrfs_destroy_delalloc_inodes(struct btrfs_root *root);
>  static int btrfs_destroy_marked_extents(struct btrfs_fs_info *fs_info,
>  					struct extent_io_tree *dirty_pages,
> @@ -4179,13 +4179,12 @@ static void btrfs_destroy_all_ordered_extents(struct btrfs_fs_info *fs_info)
>  	spin_unlock(&fs_info->ordered_root_lock);
>  }
>  
> -static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
> -				      struct btrfs_fs_info *fs_info)
> +static void btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
> +				       struct btrfs_fs_info *fs_info)
>  {
>  	struct rb_node *node;
>  	struct btrfs_delayed_ref_root *delayed_refs;
>  	struct btrfs_delayed_ref_node *ref;
> -	int ret = 0;
>  
>  	delayed_refs = &trans->delayed_refs;
>  
> @@ -4193,7 +4192,6 @@ static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
>  	if (atomic_read(&delayed_refs->num_entries) == 0) {
>  		spin_unlock(&delayed_refs->lock);
>  		btrfs_info(fs_info, "delayed_refs has NO entry");
> -		return ret;
>  	}
>  
>  	while ((node = rb_first(&delayed_refs->href_root)) != NULL) {
> @@ -4247,8 +4245,6 @@ static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
>  	}
>  
>  	spin_unlock(&delayed_refs->lock);
> -
> -	return ret;
>  }
>  
>  static void btrfs_destroy_delalloc_inodes(struct btrfs_root *root)
> 

Re: [PATCH 1/3] fs/btrfs/disk-io: Remove unneeded variable "err"

[zhong jiang]

On 2018/8/6 3:13, Nikolay Borisov wrote:
>
> On  5.08.2018 18:02, zhong jiang wrote:
>> The err is not used after initalization, So remove it and make
>> the function to be void function.
>>
>> Signed-off-by: zhong jiang <zhongjiang@huawei.com>
> The ret value of this function is not checked by the sole caller
> (btrfs_cleanup_one_transaction), however, this does not give you the
> right to use a bulk commit message. If you want your future
> contributions to be taken seriously please put actual effort in properly
> describing your changes.
 I am sorry for that. I will merge the series into a patch. I will repost.

 Thanks,
 zhong jiang
>
>> ---
>>  fs/btrfs/disk-io.c | 12 ++++--------
>>  1 file changed, 4 insertions(+), 8 deletions(-)
>>
>> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
>> index 468365d..34e4926 100644
>> --- a/fs/btrfs/disk-io.c
>> +++ b/fs/btrfs/disk-io.c
>> @@ -53,8 +53,8 @@
>>  static const struct extent_io_ops btree_extent_io_ops;
>>  static void end_workqueue_fn(struct btrfs_work *work);
>>  static void btrfs_destroy_ordered_extents(struct btrfs_root *root);
>> -static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
>> -				      struct btrfs_fs_info *fs_info);
>> +static void btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
>> +				       struct btrfs_fs_info *fs_info);
>>  static void btrfs_destroy_delalloc_inodes(struct btrfs_root *root);
>>  static int btrfs_destroy_marked_extents(struct btrfs_fs_info *fs_info,
>>  					struct extent_io_tree *dirty_pages,
>> @@ -4179,13 +4179,12 @@ static void btrfs_destroy_all_ordered_extents(struct btrfs_fs_info *fs_info)
>>  	spin_unlock(&fs_info->ordered_root_lock);
>>  }
>>  
>> -static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
>> -				      struct btrfs_fs_info *fs_info)
>> +static void btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
>> +				       struct btrfs_fs_info *fs_info)
>>  {
>>  	struct rb_node *node;
>>  	struct btrfs_delayed_ref_root *delayed_refs;
>>  	struct btrfs_delayed_ref_node *ref;
>> -	int ret = 0;
>>  
>>  	delayed_refs = &trans->delayed_refs;
>>  
>> @@ -4193,7 +4192,6 @@ static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
>>  	if (atomic_read(&delayed_refs->num_entries) == 0) {
>>  		spin_unlock(&delayed_refs->lock);
>>  		btrfs_info(fs_info, "delayed_refs has NO entry");
>> -		return ret;
>>  	}
>>  
>>  	while ((node = rb_first(&delayed_refs->href_root)) != NULL) {
>> @@ -4247,8 +4245,6 @@ static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
>>  	}
>>  
>>  	spin_unlock(&delayed_refs->lock);
>> -
>> -	return ret;
>>  }
>>  
>>  static void btrfs_destroy_delalloc_inodes(struct btrfs_root *root)
>>
>

[PATCH 2/3] fs/btrfs/extent-tree: remove redudant variable "err"

[zhong jiang]

The err is not used after initalization, So just remove it. And make
the function to be void function.

Signed-off-by: zhong jiang <zhongjiang@huawei.com>
---
 fs/btrfs/extent-tree.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index b1f2f64..ed02305 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -6464,11 +6464,10 @@ static int btrfs_add_reserved_bytes(struct btrfs_block_group_cache *cache,
  * reserve set to 0 in order to clear the reservation.
  */
 
-static int btrfs_free_reserved_bytes(struct btrfs_block_group_cache *cache,
-				     u64 num_bytes, int delalloc)
+static void btrfs_free_reserved_bytes(struct btrfs_block_group_cache *cache,
+				      u64 num_bytes, int delalloc)
 {
 	struct btrfs_space_info *space_info = cache->space_info;
-	int ret = 0;
 
 	spin_lock(&space_info->lock);
 	spin_lock(&cache->lock);
@@ -6481,7 +6480,6 @@ static int btrfs_free_reserved_bytes(struct btrfs_block_group_cache *cache,
 		cache->delalloc_bytes -= num_bytes;
 	spin_unlock(&cache->lock);
 	spin_unlock(&space_info->lock);
-	return ret;
 }
 void btrfs_prepare_extent_commit(struct btrfs_fs_info *fs_info)
 {
-- 
1.7.12.4

[PATCH 3/3] fs/btrfs/tree-log: remove the unneeded variable "err"

[zhong jiang]

The err is not used after initalization, So just remove it and make
the function to be void function.

Signed-off-by: zhong jiang <zhongjiang@huawei.com>
---
 fs/btrfs/tree-log.c | 5 +----
 fs/btrfs/tree-log.h | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 1650dc4..4ed7379 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -205,14 +205,11 @@ static int join_running_log_trans(struct btrfs_root *root)
  * until you call btrfs_end_log_trans() or it makes any future
  * log transactions wait until you call btrfs_end_log_trans()
  */
-int btrfs_pin_log_trans(struct btrfs_root *root)
+void btrfs_pin_log_trans(struct btrfs_root *root)
 {
-	int ret = -ENOENT;
-
 	mutex_lock(&root->log_mutex);
 	atomic_inc(&root->log_writers);
 	mutex_unlock(&root->log_mutex);
-	return ret;
 }
 
 /*
diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
index 122e68b..8977678 100644
--- a/fs/btrfs/tree-log.h
+++ b/fs/btrfs/tree-log.h
@@ -65,7 +65,7 @@ int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,
 			       const char *name, int name_len,
 			       struct btrfs_inode *inode, u64 dirid);
 void btrfs_end_log_trans(struct btrfs_root *root);
-int btrfs_pin_log_trans(struct btrfs_root *root);
+void btrfs_pin_log_trans(struct btrfs_root *root);
 void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans,
 			     struct btrfs_inode *dir, struct btrfs_inode *inode,
 			     int for_rename);
-- 
1.7.12.4

Re: [PATCH 0/3] Remove uneeded variable "err"

[Nikolay Borisov]

On  5.08.2018 18:02, zhong jiang wrote:
> 
> zhong jiang (3):
>   fs/btrfs/disk-io: Remove unneeded variable "err"
>   fs/btrfs/extent-tree: remove redudant variable "err"
>   fs/btrfs/tree-log: remove the unneeded variable "err"
> 
>  fs/btrfs/disk-io.c     | 12 ++++--------
>  fs/btrfs/extent-tree.c |  6 ++----
>  fs/btrfs/tree-log.c    |  5 +----
>  fs/btrfs/tree-log.h    |  2 +-
>  4 files changed, 8 insertions(+), 17 deletions(-)
> 


NAK on the whole series on the basis of using a bulk commit message
which doesn't really describe the changes of each individual commit. If
you want those changes to eventually be merged resubmit the series with
individual reasoning for every commit.

Re: [PATCH 0/3] Remove uneeded variable "err"

[zhong jiang]

On 2018/8/6 3:14, Nikolay Borisov wrote:
>
> On  5.08.2018 18:02, zhong jiang wrote:
>> zhong jiang (3):
>>   fs/btrfs/disk-io: Remove unneeded variable "err"
>>   fs/btrfs/extent-tree: remove redudant variable "err"
>>   fs/btrfs/tree-log: remove the unneeded variable "err"
>>
>>  fs/btrfs/disk-io.c     | 12 ++++--------
>>  fs/btrfs/extent-tree.c |  6 ++----
>>  fs/btrfs/tree-log.c    |  5 +----
>>  fs/btrfs/tree-log.h    |  2 +-
>>  4 files changed, 8 insertions(+), 17 deletions(-)
>>
>
> NAK on the whole series on the basis of using a bulk commit message
> which doesn't really describe the changes of each individual commit. If
> you want those changes to eventually be merged resubmit the series with
> individual reasoning for every commit.
>
>
 It's sorry for using a bulk commit message. I will repost with a patch
 because it solves the same issue.

Thanks,
zhong jiang