Commit c60855cd authored May 17, 2013 by Aaron Lu Committed by Jens Axboe May 17, 2013

blkpm: avoid sleep when holding queue lock



In blk_post_runtime_resume, an autosuspend request will be initiated for
the device. Since we are holding the queue lock, we can't sleep and thus
we should use the async version to initiate an autosuspend, i.e.
pm_request_suspend instead of pm_runtime_suspend, which might sleep.

Signed-off-by: Aaron Lu <aaron.lu@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent c0a363f5

block/blk-core.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3164,7 +3164,7 @@ void blk_post_runtime_resume(struct request_queue *q, int err)
	q->rpm_status = RPM_ACTIVE;		q->rpm_status = RPM_ACTIVE;
	__blk_run_queue(q);		__blk_run_queue(q);
	pm_runtime_mark_last_busy(q->dev);		pm_runtime_mark_last_busy(q->dev);
	pm_runtime_autosuspend(q->dev);		pm_request_autosuspend(q->dev);
	} else {		} else {
	q->rpm_status = RPM_SUSPENDED;		q->rpm_status = RPM_SUSPENDED;
	}		}

Admin message