* [PATCH v2] btrfs: removed unused return variable
@ 2019-09-30 13:00 Aliasgar Surti
2019-09-30 13:21 ` Nikolay Borisov
2019-09-30 13:33 ` David Sterba
0 siblings, 2 replies; 4+ messages in thread
From: Aliasgar Surti @ 2019-09-30 13:00 UTC (permalink / raw)
To: clm, josef, dsterba, linux-btrfs; +Cc: Aliasgar Surti
From: Aliasgar Surti <aliasgar.surti500@gmail.com>
Removed unused return variable and replaced it with returning
the value directly
Signed-off-by: Aliasgar Surti <aliasgar.surti500@gmail.com>
---
v2: Made btrfs_destroy_delayed_refs() as void and removed its declaration
---
fs/btrfs/disk-io.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 044981c..0a8243a 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -52,8 +52,6 @@
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_delalloc_inodes(struct btrfs_root *root);
static int btrfs_destroy_marked_extents(struct btrfs_fs_info *fs_info,
struct extent_io_tree *dirty_pages,
@@ -4249,13 +4247,12 @@ static void btrfs_destroy_all_ordered_extents(struct btrfs_fs_info *fs_info)
btrfs_wait_ordered_roots(fs_info, U64_MAX, 0, (u64)-1);
}
-static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
+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;
@@ -4263,7 +4260,7 @@ 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;
+ return;
}
while ((node = rb_first_cached(&delayed_refs->href_root)) != NULL) {
@@ -4306,8 +4303,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)
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] btrfs: removed unused return variable
2019-09-30 13:00 [PATCH v2] btrfs: removed unused return variable Aliasgar Surti
@ 2019-09-30 13:21 ` Nikolay Borisov
2019-09-30 13:33 ` David Sterba
1 sibling, 0 replies; 4+ messages in thread
From: Nikolay Borisov @ 2019-09-30 13:21 UTC (permalink / raw)
To: Aliasgar Surti, clm, David Sterba, josef, linux-btrfs
On 30.09.19 г. 16:00 ч., Aliasgar Surti wrote:
> From: Aliasgar Surti <aliasgar.surti500@gmail.com>
>
> Removed unused return variable and replaced it with returning
> the value directly
The changelog could be expanded, something like:
btrfs_destroy_delayed_refs always returns 0 so it can be converted to
void. While at it also remove the unnecessary forward declaration in
disk-io.c
>
> Signed-off-by: Aliasgar Surti <aliasgar.surti500@gmail.com>
Code wise it's ok:
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
> ---
> v2: Made btrfs_destroy_delayed_refs() as void and removed its declaration
> ---
> fs/btrfs/disk-io.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
> index 044981c..0a8243a 100644
> --- a/fs/btrfs/disk-io.c
> +++ b/fs/btrfs/disk-io.c
> @@ -52,8 +52,6 @@
> 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_delalloc_inodes(struct btrfs_root *root);
> static int btrfs_destroy_marked_extents(struct btrfs_fs_info *fs_info,
> struct extent_io_tree *dirty_pages,
> @@ -4249,13 +4247,12 @@ static void btrfs_destroy_all_ordered_extents(struct btrfs_fs_info *fs_info)
> btrfs_wait_ordered_roots(fs_info, U64_MAX, 0, (u64)-1);
> }
>
> -static int btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
> +static void btrfs_destroy_delayed_refs(struct btrfs_transaction *trans,
> struct btrfs_fs_info *fs_info)
^^^^^^
nit: It's good practice to also adjust the alignment of following lines.
> {
> 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;
>
> @@ -4263,7 +4260,7 @@ 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;
> + return;
> }
>
> while ((node = rb_first_cached(&delayed_refs->href_root)) != NULL) {
> @@ -4306,8 +4303,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)
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] btrfs: removed unused return variable
2019-09-30 13:00 [PATCH v2] btrfs: removed unused return variable Aliasgar Surti
2019-09-30 13:21 ` Nikolay Borisov
@ 2019-09-30 13:33 ` David Sterba
2019-10-01 7:00 ` Aliasgar Surti
1 sibling, 1 reply; 4+ messages in thread
From: David Sterba @ 2019-09-30 13:33 UTC (permalink / raw)
To: Aliasgar Surti; +Cc: clm, josef, dsterba, linux-btrfs
On Mon, Sep 30, 2019 at 06:30:21PM +0530, Aliasgar Surti wrote:
> From: Aliasgar Surti <aliasgar.surti500@gmail.com>
>
> Removed unused return variable and replaced it with returning
> the value directly
This change has been sent several times and I give the same answer each
time:
https://lore.kernel.org/linux-btrfs/20190418154913.GO20156@twin.jikos.cz/
"When switching a fuction to return void, please check the whole
callgraph for functions that do not properly handler errors and do
BUG_ON. You won't see errors passed from them so this gives the
impression no error handling is needed in the caller.
This has been sent in the past, so I can point you to the 2nd paragraph
in
https://lore.kernel.org/linux-btrfs/20180815124425.GM24025@twin.jikos.cz/
hint: btrfs_pin_extent"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] btrfs: removed unused return variable
2019-09-30 13:33 ` David Sterba
@ 2019-10-01 7:00 ` Aliasgar Surti
0 siblings, 0 replies; 4+ messages in thread
From: Aliasgar Surti @ 2019-10-01 7:00 UTC (permalink / raw)
To: dsterba, clm, josef, dsterba, linux-btrfs
On Mon, Sep 30, 2019 at 03:33:35PM +0200, David Sterba wrote:
> On Mon, Sep 30, 2019 at 06:30:21PM +0530, Aliasgar Surti wrote:
> > From: Aliasgar Surti <aliasgar.surti500@gmail.com>
> >
> > Removed unused return variable and replaced it with returning
> > the value directly
>
> This change has been sent several times and I give the same answer each
> time:
>
> https://lore.kernel.org/linux-btrfs/20190418154913.GO20156@twin.jikos.cz/
>
> "When switching a fuction to return void, please check the whole
> callgraph for functions that do not properly handler errors and do
> BUG_ON. You won't see errors passed from them so this gives the
> impression no error handling is needed in the caller.
>
> This has been sent in the past, so I can point you to the 2nd paragraph
> in
> https://lore.kernel.org/linux-btrfs/20180815124425.GM24025@twin.jikos.cz/
>
> hint: btrfs_pin_extent"
Okay, reverted back the changes and submitted v3.
Thanks,
Aliasgar
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-10-01 7:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-30 13:00 [PATCH v2] btrfs: removed unused return variable Aliasgar Surti
2019-09-30 13:21 ` Nikolay Borisov
2019-09-30 13:33 ` David Sterba
2019-10-01 7:00 ` Aliasgar Surti
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).