[PATCH][next] blktrace: remove redundant return at end of function

Colin Ian King posted 1 patch 1 year ago
kernel/trace/blktrace.c | 2 --
1 file changed, 2 deletions(-)
[PATCH][next] blktrace: remove redundant return at end of function
Posted by Colin Ian King 1 year ago
A recent change added return 0 before an existing return statement
at the end of function blk_trace_setup. The final return is now
redundant, so remove it.

Fixes: 64d124798244 ("blktrace: move copy_[to|from]_user() out of ->debugfs_lock")

Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
---
 kernel/trace/blktrace.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 18c81e6aa496..3679a6d18934 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -639,8 +639,6 @@ int blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
 		return -EFAULT;
 	}
 	return 0;
-
-	return ret;
 }
 EXPORT_SYMBOL_GPL(blk_trace_setup);
 
-- 
2.39.5
Re: [PATCH][next] blktrace: remove redundant return at end of function
Posted by Ming Lei 1 year ago
On Wed, Dec 4, 2024 at 11:05 PM Colin Ian King <colin.i.king@gmail.com> wrote:
>
> A recent change added return 0 before an existing return statement
> at the end of function blk_trace_setup. The final return is now
> redundant, so remove it.
>
> Fixes: 64d124798244 ("blktrace: move copy_[to|from]_user() out of ->debugfs_lock")
>
> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
> ---
>  kernel/trace/blktrace.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
> index 18c81e6aa496..3679a6d18934 100644
> --- a/kernel/trace/blktrace.c
> +++ b/kernel/trace/blktrace.c
> @@ -639,8 +639,6 @@ int blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
>                 return -EFAULT;
>         }
>         return 0;
> -
> -       return ret;
>  }
>  EXPORT_SYMBOL_GPL(blk_trace_setup);

Reviewed-by: Ming Lei <ming.lei@redhat.com>

Thanks,
Re: [PATCH][next] blktrace: remove redundant return at end of function
Posted by Jens Axboe 1 year ago
On Wed, 04 Dec 2024 15:04:50 +0000, Colin Ian King wrote:
> A recent change added return 0 before an existing return statement
> at the end of function blk_trace_setup. The final return is now
> redundant, so remove it.
> 
> Fixes: 64d124798244 ("blktrace: move copy_[to|from]_user() out of ->debugfs_lock")
> 
> 
> [...]

Applied, thanks!

[1/1] blktrace: remove redundant return at end of function
      commit: 62047e8946da6269cf9bcec578298dd194ee4b7f

Best regards,
-- 
Jens Axboe