aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/floppy.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-11-16 09:10:02 +0100
committerJens Axboe <axboe@kernel.dk>2018-11-16 09:16:57 -0700
commit503f620f0cb8a9da9c2bba72f2141aaa4b0e3962 (patch)
treeae82f616bfd89992f6426b87a8e564bd8d913737 /drivers/block/floppy.c
parentblock: remove the rq_alloc_data request_queue field (diff)
downloadlinux-dev-503f620f0cb8a9da9c2bba72f2141aaa4b0e3962.tar.xz
linux-dev-503f620f0cb8a9da9c2bba72f2141aaa4b0e3962.zip
floppy: remove queue_lock around floppy_end_request
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>
Diffstat (limited to 'drivers/block/floppy.c')
-rw-r--r--drivers/block/floppy.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index eeb4be8d000b..218099dd8e44 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -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);
}
}