diff mbox

block: fix returnvar.cocci warnings

Message ID alpine.DEB.2.02.1505262157340.2027@localhost6.localdomain6 (mailing list archive)
State New, archived
Headers show

Commit Message

Julia Lawall May 26, 2015, 7:59 p.m. UTC 
Remove unneeded variable used to store return value.

Generated by: scripts/coccinelle/misc/returnvar.cocci

Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Julia Lawall <julia.lawall@lip6.fr>
---

One could check whether the ret variable was intended to be used for 
anything.

 fs/buffer.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Jens Axboe May 26, 2015, 8:10 p.m. UTC | #1 
On 05/26/2015 01:59 PM, Julia Lawall wrote:
> Remove unneeded variable used to store return value.
>
> Generated by: scripts/coccinelle/misc/returnvar.cocci

Applied, thanks.--
Jens Axboe

--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rik van Riel May 28, 2015, 1:36 a.m. UTC | #2 
On 05/26/2015 03:59 PM, Julia Lawall wrote:
> Remove unneeded variable used to store return value.
> 
> Generated by: scripts/coccinelle/misc/returnvar.cocci
> 
> Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
> Signed-off-by: Julia Lawall <julia.lawall@lip6.fr>
> ---
> 
> One could check whether the ret variable was intended to be used for 
> anything.

Which tree is this against?

Linus's latest tree still has this in _submit_bh
(unless git didn't pull the latest updates right):

        if (buffer_meta(bh))
                rw |= REQ_META;
        if (buffer_prio(bh))
                rw |= REQ_PRIO;

        bio_get(bio);
        submit_bio(rw, bio);

        if (bio_flagged(bio, BIO_EOPNOTSUPP))
                ret = -EOPNOTSUPP;

        bio_put(bio);
        return ret;
}
Jens Axboe May 28, 2015, 1:38 a.m. UTC | #3 
On 05/27/2015 07:36 PM, Rik van Riel wrote:
> On 05/26/2015 03:59 PM, Julia Lawall wrote:
>> Remove unneeded variable used to store return value.
>>
>> Generated by: scripts/coccinelle/misc/returnvar.cocci
>>
>> Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
>> Signed-off-by: Julia Lawall <julia.lawall@lip6.fr>
>> ---
>>
>> One could check whether the ret variable was intended to be used for
>> anything.
>
> Which tree is this against?
>
> Linus's latest tree still has this in _submit_bh
> (unless git didn't pull the latest updates right):
>
>          if (buffer_meta(bh))
>                  rw |= REQ_META;
>          if (buffer_prio(bh))
>                  rw |= REQ_PRIO;
>
>          bio_get(bio);
>          submit_bio(rw, bio);
>
>          if (bio_flagged(bio, BIO_EOPNOTSUPP))
>                  ret = -EOPNOTSUPP;
>
>          bio_put(bio);
>          return ret;

for-4.2/core has dropped the EOPNOTSUPP parts, that's where Julia found 
the issue of the now unused 'ret'.
diff mbox

Patch

--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2996,7 +2996,6 @@  void guard_bio_eod(int rw, struct bio *b
 int _submit_bh(int rw, struct buffer_head *bh, unsigned long bio_flags)
 {
 	struct bio *bio;
-	int ret = 0;
 
 	BUG_ON(!buffer_locked(bh));
 	BUG_ON(!buffer_mapped(bh));
@@ -3038,7 +3037,7 @@  int _submit_bh(int rw, struct buffer_hea
 		rw |= REQ_PRIO;
 
 	submit_bio(rw, bio);
-	return ret;
+	return 0;
 }
 EXPORT_SYMBOL_GPL(_submit_bh);