| Message ID | 1533481371-21349-2-git-send-email-zhongjiang@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Remove uneeded variable "err" | expand |
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) { -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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) > -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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) { > > . > -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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) >> > -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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)
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(-)