linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Christoph Hellwig <hch@infradead.org>,
	Al Viro <viro@ZenIV.linux.org.uk>
Subject: linux-next: manual merge of the akpm tree with the vfs tree
Date: Mon, 18 Jul 2011 18:55:50 +1000	[thread overview]
Message-ID: <20110718185550.566328117558bea28395ca30@canb.auug.org.au> (raw)

Hi Andrew,

Today's linux-next merge of the scsi-post-merge tree got a conflict in
mm/truncate.c between commit ba96a361e21b ("fs: kill i_alloc_sem") from
the vfs tree and commit "Use consistent variable names in
truncate_pagecache(), truncate_setsize()" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc mm/truncate.c
index 003c6c6,a87d838..0000000
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@@ -622,11 -625,12 +625,11 @@@ int vmtruncate_range(struct inode *inod
  		return -ENOSYS;
  
  	mutex_lock(&inode->i_mutex);
 -	down_write(&inode->i_alloc_sem);
 +	inode_dio_wait(inode);
- 	unmap_mapping_range(mapping, offset, (end - offset), 1);
- 	inode->i_op->truncate_range(inode, offset, end);
+ 	unmap_mapping_range(mapping, holebegin, holelen, 1);
+ 	inode->i_op->truncate_range(inode, lstart, lend);
  	/* unmap again to remove racily COWed private pages */
- 	unmap_mapping_range(mapping, offset, (end - offset), 1);
+ 	unmap_mapping_range(mapping, holebegin, holelen, 1);
 -	up_write(&inode->i_alloc_sem);
  	mutex_unlock(&inode->i_mutex);
  
  	return 0;

             reply	other threads:[~2011-07-18  8:55 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-18  8:55 Stephen Rothwell [this message]
2012-07-22  5:44 Stephen Rothwell
2012-09-24 13:06 Stephen Rothwell
2012-09-24 13:12 Stephen Rothwell
2012-09-24 13:40 Stephen Rothwell
2013-02-25  3:40 Stephen Rothwell
2013-04-04  6:04 Stephen Rothwell
2013-04-04  6:12 Stephen Rothwell
2013-04-04 12:33 ` Jan Kara
2013-04-04  6:17 Stephen Rothwell
2013-04-04  6:26 Stephen Rothwell
2013-04-04  6:56 ` Andrew Morton
2013-04-04  7:02   ` Andrew Morton
2013-04-04  8:10     ` Al Viro
2013-04-04 23:18       ` Stephen Rothwell
2013-04-04  8:02   ` Al Viro
2013-04-04 15:43     ` Nathan Zimmer
2013-04-29  8:25 Stephen Rothwell
2013-04-29  8:34 Stephen Rothwell
2013-04-30  5:54 Stephen Rothwell
2013-09-05  8:56 Stephen Rothwell
2013-09-10  4:41 Stephen Rothwell
2014-08-08  6:20 Stephen Rothwell
2016-12-12  5:52 Stephen Rothwell
2016-12-12  8:14 ` Ian Kent
2018-01-02  6:46 Stephen Rothwell
2018-05-17  6:36 Stephen Rothwell
2019-04-11  6:21 Stephen Rothwell
2020-05-15 11:33 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110718185550.566328117558bea28395ca30@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=hch@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=viro@ZenIV.linux.org.uk \
    --subject='Re: linux-next: manual merge of the akpm tree with the vfs tree' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).