linux-kernel - linux-next: manual merge of the akpm 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]

Message-Id: <20130527162026.3eebd45b3755a138e443c28e@canb.auug.org.au>
Date:	Mon, 27 May 2013 16:20:26 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kent Overstreet <koverstreet@...gle.com>,
	Benjamin LaHaise <bcrl@...ck.org>
Subject: linux-next: manual merge of the akpm tree with Linus' tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in fs/aio.c
between commit 03e04f048d27 ("aio: fix kioctx not being freed after
cancellation at exit time") from Linus' tree and commit "aio: reqs_active
-> reqs_available" from the akpm tree.

I fixed it up (see below - taken from a similar patch later in the akpm
tree) and can carry the fix as necessary (no action is required).

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

diff --cc fs/aio.c
index 7fe5bde,009a7b5..0000000
--- a/fs/aio.c
+++ b/fs/aio.c
@@@ -306,10 -312,8 +312,10 @@@ static void free_ioctx(struct kioctx *c
  	head = ring->head;
  	kunmap_atomic(ring);
  
- 	while (atomic_read(&ctx->reqs_active) > 0) {
+ 	while (atomic_read(&ctx->reqs_available) < ctx->nr_events - 1) {
 -		wait_event(ctx->wait, head != ctx->tail);
 +		wait_event(ctx->wait,
- 				head != ctx->tail ||
- 				atomic_read(&ctx->reqs_active) <= 0);
++			   (head != ctx->tail) ||
++			   (atomic_read(&ctx->reqs_available) >= ctx->nr_events - 1));
  
  		avail = (head <= ctx->tail ? ctx->tail : ctx->nr_events) - head;
  

Content of type "application/pgp-signature" skipped