Commit 503f620f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 2b78eae1

drivers/block/floppy.c

+0 −5
Original line number Diff line number Diff line
@@ -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);

	}

}