linux-kernel - linux-next: manual merge of the block tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Fri, 7 Dec 2012 13:44:52 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jens Axboe <axboe@...nel.dk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Roland Dreier <roland@...estorage.com>,
	Bart Van Assche <bvanassche@....org>
Subject: linux-next: manual merge of the block tree with Linus' tree

Hi Jens,

Today's linux-next merge of the block tree got a conflict in
block/blk-exec.c between commit 893d290f1d74 ("block: Don't access
request after it might be freed") from Linus' tree and commit
c246e80d8673 ("block: Avoid that request_fn is invoked on a dead queue")
from the block tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc block/blk-exec.c
index f71eac3,1320e74..0000000
--- a/block/blk-exec.c
+++ b/block/blk-exec.c
@@@ -77,8 -71,8 +77,8 @@@ void blk_execute_rq_nowait(struct reque
  	__elv_add_request(q, rq, where);
  	__blk_run_queue(q);
  	/* the queue is stopped so it won't be run */
 -	if (rq->cmd_type == REQ_TYPE_PM_RESUME)
 +	if (is_pm_resume)
- 		q->request_fn(q);
+ 		__blk_run_queue_uncond(q);
  	spin_unlock_irq(q->queue_lock);
  }
  EXPORT_SYMBOL_GPL(blk_execute_rq_nowait);

Content of type "application/pgp-signature" skipped