OSDN Git Service

floppy: remove queue_lock around floppy_end_request
authorChristoph Hellwig <hch@lst.de>
Fri, 16 Nov 2018 08:10:02 +0000 (09:10 +0100)
committerJens Axboe <axboe@kernel.dk>
Fri, 16 Nov 2018 16:16:57 +0000 (09:16 -0700)
There is nothing the queue_lock could protect inside floppy_end_request,
so remove it.

Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/floppy.c

index eeb4be8..218099d 100644 (file)
@@ -2254,10 +2254,7 @@ static void request_done(int uptodate)
                if (block > _floppy->sect)
                        DRS->maxtrack = 1;
 
-               /* unlock chained buffers */
-               spin_lock_irqsave(&q->queue_lock, flags);
                floppy_end_request(req, 0);
-               spin_unlock_irqrestore(&q->queue_lock, flags);
        } else {
                if (rq_data_dir(req) == WRITE) {
                        /* record write error information */
@@ -2269,9 +2266,7 @@ static void request_done(int uptodate)
                        DRWE->last_error_sector = blk_rq_pos(req);
                        DRWE->last_error_generation = DRS->generation;
                }
-               spin_lock_irqsave(&q->queue_lock, flags);
                floppy_end_request(req, BLK_STS_IOERR);
-               spin_unlock_irqrestore(&q->queue_lock, flags);
        }
 }