| Message ID | 20220314150321.17720-1-lukas.bulwahn@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | sr: simplify the local variable initialization in sr_block_open() | expand |
On 3/14/22 9:03 AM, Lukas Bulwahn wrote: > Commit 01d0c698536f ("sr: implement ->free_disk to simplify refcounting") > refactored sr_block_open(), initialized one variable with a duplicate > assignment (probably an unintended copy & paste duplication) and turned one > error case into an early return, which makes the initialization of the > return variable needless. > > So, simplify the local variable initialization in sr_block_open() to make > the code a bit more clear. > > No functional change. No change in resulting object code. > > Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> > --- > Christoph, please ack. > > Jens, please pick this minor clean-up on your -next branch on top of the > commit above. Should it have a Fixes line?
On Mon, Mar 14, 2022 at 4:05 PM Jens Axboe <axboe@kernel.dk> wrote: > > On 3/14/22 9:03 AM, Lukas Bulwahn wrote: > > Commit 01d0c698536f ("sr: implement ->free_disk to simplify refcounting") > > refactored sr_block_open(), initialized one variable with a duplicate > > assignment (probably an unintended copy & paste duplication) and turned one > > error case into an early return, which makes the initialization of the > > return variable needless. > > > > So, simplify the local variable initialization in sr_block_open() to make > > the code a bit more clear. > > > > No functional change. No change in resulting object code. > > > > Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> > > --- > > Christoph, please ack. > > > > Jens, please pick this minor clean-up on your -next branch on top of the > > commit above. > > Should it have a Fixes line? > As it is really just syntactic clean-up, it does not deserve the attention for any kind of severity assessment or potential backporting, which usually comes with a Fixes: tag. So, I personally do not consider a Fixes: tag needed. The code works well before this patch, and well after this patch; it is just a bit more clear now. Lukas > -- > Jens Axboe >
On Mon, Mar 14, 2022 at 04:03:21PM +0100, Lukas Bulwahn wrote: > Commit 01d0c698536f ("sr: implement ->free_disk to simplify refcounting") > refactored sr_block_open(), initialized one variable with a duplicate > assignment (probably an unintended copy & paste duplication) and turned one > error case into an early return, which makes the initialization of the > return variable needless. > > So, simplify the local variable initialization in sr_block_open() to make > the code a bit more clear. > > No functional change. No change in resulting object code. > > Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> > --- > Christoph, please ack. > > Jens, please pick this minor clean-up on your -next branch on top of the > commit above. Looks good: Reviewed-by: Christoph Hellwig <hch@lst.de>
On Mon, 14 Mar 2022 16:03:21 +0100, Lukas Bulwahn wrote: > Commit 01d0c698536f ("sr: implement ->free_disk to simplify refcounting") > refactored sr_block_open(), initialized one variable with a duplicate > assignment (probably an unintended copy & paste duplication) and turned one > error case into an early return, which makes the initialization of the > return variable needless. > > So, simplify the local variable initialization in sr_block_open() to make > the code a bit more clear. > > [...] Applied, thanks! [1/1] sr: simplify the local variable initialization in sr_block_open() commit: 79d45f57a19537a1ec6ebf836944e968b154f86e Best regards,
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 00142095522a..5ba9df334968 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -483,9 +483,9 @@ static void sr_revalidate_disk(struct scsi_cd *cd) static int sr_block_open(struct block_device *bdev, fmode_t mode) { - struct scsi_cd *cd = cd = scsi_cd(bdev->bd_disk); + struct scsi_cd *cd = scsi_cd(bdev->bd_disk); struct scsi_device *sdev = cd->device; - int ret = -ENXIO; + int ret; if (scsi_device_get(cd->device)) return -ENXIO;
Commit 01d0c698536f ("sr: implement ->free_disk to simplify refcounting") refactored sr_block_open(), initialized one variable with a duplicate assignment (probably an unintended copy & paste duplication) and turned one error case into an early return, which makes the initialization of the return variable needless. So, simplify the local variable initialization in sr_block_open() to make the code a bit more clear. No functional change. No change in resulting object code. Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com> --- Christoph, please ack. Jens, please pick this minor clean-up on your -next branch on top of the commit above. drivers/scsi/sr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)