lkml.org 
[lkml]   [2018]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.4 03/32] swim: fix cleanup on setup error
    Date
    From: Omar Sandoval <osandov@fb.com>

    [ Upstream commit 1448a2a5360ae06f25e2edc61ae070dff5c0beb4 ]

    If we fail to allocate the request queue for a disk, we still need to
    free that disk, not just the previous ones. Additionally, we need to
    cleanup the previous request queues.

    Signed-off-by: Omar Sandoval <osandov@fb.com>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/block/swim.c | 13 +++++++++++--
    1 file changed, 11 insertions(+), 2 deletions(-)

    diff --git a/drivers/block/swim.c b/drivers/block/swim.c
    index b5afd495d482..eec6e393c124 100644
    --- a/drivers/block/swim.c
    +++ b/drivers/block/swim.c
    @@ -868,8 +868,17 @@ static int swim_floppy_init(struct swim_priv *swd)

    exit_put_disks:
    unregister_blkdev(FLOPPY_MAJOR, "fd");
    - while (drive--)
    - put_disk(swd->unit[drive].disk);
    + do {
    + struct gendisk *disk = swd->unit[drive].disk;
    +
    + if (disk) {
    + if (disk->queue) {
    + blk_cleanup_queue(disk->queue);
    + disk->queue = NULL;
    + }
    + put_disk(disk);
    + }
    + } while (drive--);
    return err;
    }

    --
    2.17.1
    \
     
     \ /
      Last update: 2018-11-01 00:17    [W:5.370 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site