Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>

But one very minor nitpick below:

 #ifdef CONFIG_PM
+static inline void blk_pm_request_resume(struct request_queue *q)
+{
+	if (q->dev && (q->rpm_status == RPM_SUSPENDED ||
+		       q->rpm_status == RPM_SUSPENDING))

I usually try to break lines around related conditions, so more something
like:

	if (q->dev &&
	    (q->rpm_status == RPM_SUSPENDED || q->rpm_status == RPM_SUSPENDING))