From: NeilBrown <neilb@suse.de>
To: Julia Lawall <Julia.Lawall@lip6.fr>
Cc: kernel-janitors@vger.kernel.org, linux-raid@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 9/13] md: make return of 0 explicit
Date: Tue, 20 May 2014 15:45:20 +1000 [thread overview]
Message-ID: <20140520154520.61487a1c@notabene.brown> (raw)
In-Reply-To: <1400473875-22228-10-git-send-email-Julia.Lawall@lip6.fr>
[-- Attachment #1: Type: text/plain, Size: 2003 bytes --]
On Mon, 19 May 2014 06:31:11 +0200 Julia Lawall <Julia.Lawall@lip6.fr> wrote:
> From: Julia Lawall <Julia.Lawall@lip6.fr>
>
> Delete unnecessary local variable whose value is always 0 and that hides
> the fact that the result is always 0.
>
> A simplified version of the semantic patch that fixes this problem is as
> follows: (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @r exists@
> local idexpression ret;
> expression e;
> position p;
> @@
>
> -ret = 0;
> ... when != ret = e
> return
> - ret
> + 0
> ;
> // </smpl>
>
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
>
> ---
> Alternatively, was an error code intended in the MD_MAX_BADBLOCKS case?
Yes, I did want an error code in that case - thanks!
I'll make a patch.
NeilBrown
>
> drivers/md/md.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/md/md.c b/drivers/md/md.c
> index f477e4c..23b7fee 100644
> --- a/drivers/md/md.c
> +++ b/drivers/md/md.c
> @@ -8297,7 +8297,6 @@ static int md_clear_badblocks(struct badblocks *bb, sector_t s, int sectors)
> u64 *p;
> int lo, hi;
> sector_t target = s + sectors;
> - int rv = 0;
>
> if (bb->shift > 0) {
> /* When clearing we round the start up and the end down.
> @@ -8339,10 +8338,8 @@ static int md_clear_badblocks(struct badblocks *bb, sector_t s, int sectors)
>
> if (a < s) {
> /* we need to split this range */
> - if (bb->count >= MD_MAX_BADBLOCKS) {
> - rv = 0;
> + if (bb->count >= MD_MAX_BADBLOCKS)
> goto out;
> - }
> memmove(p+lo+1, p+lo, (bb->count - lo) * 8);
> bb->count++;
> p[lo] = BB_MAKE(a, s-a, ack);
> @@ -8378,7 +8375,7 @@ static int md_clear_badblocks(struct badblocks *bb, sector_t s, int sectors)
> bb->changed = 1;
> out:
> write_sequnlock_irq(&bb->lock);
> - return rv;
> + return 0;
> }
>
> int rdev_clear_badblocks(struct md_rdev *rdev, sector_t s, int sectors,
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
prev parent reply other threads:[~2014-05-20 5:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-19 4:31 [PATCH 0/13] make return of 0 explicit Julia Lawall
2014-05-19 4:31 ` [PATCH 9/13] md: " Julia Lawall
2014-05-20 5:45 ` NeilBrown [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140520154520.61487a1c@notabene.brown \
--to=neilb@suse.de \
--cc=Julia.Lawall@lip6.fr \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).