UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Christoph Hellwig 2018-11-16 09:10:02 +01:00 committed by Jens Axboe
parent 2b78eae147
commit 503f620f0c
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/block/floppy.c
View File

@ -2254,10 +2254,7 @@ static void request_done(int uptodate)
if (block > _floppy->sect) if (block > _floppy->sect)
DRS->maxtrack = 1; DRS->maxtrack = 1;
/* unlock chained buffers */
spin_lock_irqsave(&q->queue_lock, flags);
floppy_end_request(req, 0); floppy_end_request(req, 0);
spin_unlock_irqrestore(&q->queue_lock, flags);
} else { } else {
if (rq_data_dir(req) == WRITE) { if (rq_data_dir(req) == WRITE) {
/* record write error information */ /* 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_sector = blk_rq_pos(req);
DRWE->last_error_generation = DRS->generation; DRWE->last_error_generation = DRS->generation;
} }
spin_lock_irqsave(&q->queue_lock, flags);
floppy_end_request(req, BLK_STS_IOERR); floppy_end_request(req, BLK_STS_IOERR);
spin_unlock_irqrestore(&q->queue_lock, flags);
} }
} }