linux-kernel - linux-next: manual merge of the akpm-current tree with the aio-direct 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: <20130821183422.af59fd4ceaa9f1d7464cc705@canb.auug.org.au>
Date:	Wed, 21 Aug 2013 18:34:22 +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,
	Hugh Dickins <hughd@...gle.com>,
	Dave Kleikamp <dave.kleikamp@...cle.com>,
	Matthew Wilcox <willy@...ux.intel.com>
Subject: linux-next: manual merge of the akpm-current tree with the
 aio-direct tree

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
mm/shmem.c between commit b080082bc3e8 ("tmpfs: add support for read_iter
and write_iter") from the aio-direct tree and commit c6dc71ff08f7 ("mm:
drop actor argument of do_shmem_file_read()") from the akpm-current 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 mm/shmem.c
index 786d390,75010ba..0000000
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@@ -1555,13 -1546,14 +1555,14 @@@ static ssize_t shmem_file_read_iter(str
  		 * Ok, we have the page, and it's up-to-date, so
  		 * now we can copy it to user space...
  		 *
- 		 * The actor routine returns how many bytes were actually used..
 -		 * The file_read_actor routine returns how many bytes were actually
 -		 * used..
++		 * The file_read_iter_actor routine returns how many bytes
++		 * were actually used..
  		 * NOTE! This may not be the same as how much of a user buffer
  		 * we filled up (we may be padding etc), so we can only update
- 		 * "pos" here (the actor routine has to update the user buffer
 -		 * "pos" here (file_read_actor has to update the user buffer
--		 * pointers and the remaining count).
++		 * "pos" here (file_read_iter_actor has to update the user
++		 * buffer pointers and the remaining count).
  		 */
 -		ret = file_read_actor(desc, page, offset, nr);
 +		ret = file_read_iter_actor(&desc, page, offset, nr);
  		offset += ret;
  		index += offset >> PAGE_CACHE_SHIFT;
  		offset &= ~PAGE_CACHE_MASK;

Content of type "application/pgp-signature" skipped