Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>,
	David Chinner <david@fromorbit.com>,
	linux-xfs@vger.kernel.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	"Darrick J. Wong" <darrick.wong@oracle.com>
Subject: linux-next: manual merge of the vfs tree with the xfs tree
Date: Mon, 12 Dec 2016 10:19:44 +1100
Message-ID: <20161212101945.31f29cb1@canb.auug.org.au> (raw)

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in:

  fs/xfs/xfs_reflink.c

between commit:

  fba3e594ef0a ("xfs: always succeed when deduping zero bytes")

from the xfs tree and commit:

  876bec6f9bbf ("vfs: refactor clone/dedupe_file_range common functions")

from the vfs tree.

I fixed it up (the latter removed some code updated by the former and
see below) and can carry the fix as necessary. This is now fixed as far
as linux-next is concerned, but any non trivial conflicts should be
mentioned to your upstream maintainer when your tree is submitted for
merging.  You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/xfs/xfs_reflink.c
index 88fd03c66e99,95d6828967f0..000000000000
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@@ -1251,32 -1194,16 +1143,14 @@@ xfs_reflink_remap_range
  		return -EIO;
  
  	/* Lock both files against IO */
 -	if (same_inode) {
 -		xfs_ilock(src, XFS_IOLOCK_EXCL);
 +	lock_two_nondirectories(inode_in, inode_out);
 +	if (same_inode)
  		xfs_ilock(src, XFS_MMAPLOCK_EXCL);
 -	} else {
 -		xfs_lock_two_inodes(src, dest, XFS_IOLOCK_EXCL);
 +	else
  		xfs_lock_two_inodes(src, dest, XFS_MMAPLOCK_EXCL);
 -	}
  
- 	/* Don't touch certain kinds of inodes */
- 	ret = -EPERM;
- 	if (IS_IMMUTABLE(inode_out))
- 		goto out_unlock;
- 
- 	ret = -ETXTBSY;
- 	if (IS_SWAPFILE(inode_in) || IS_SWAPFILE(inode_out))
- 		goto out_unlock;
- 
- 
- 	/* Don't reflink dirs, pipes, sockets... */
- 	ret = -EISDIR;
- 	if (S_ISDIR(inode_in->i_mode) || S_ISDIR(inode_out->i_mode))
- 		goto out_unlock;
+ 	/* Check file eligibility and prepare for block sharing. */
  	ret = -EINVAL;
- 	if (S_ISFIFO(inode_in->i_mode) || S_ISFIFO(inode_out->i_mode))
- 		goto out_unlock;
- 	if (!S_ISREG(inode_in->i_mode) || !S_ISREG(inode_out->i_mode))
- 		goto out_unlock;
- 
  	/* Don't reflink realtime inodes */
  	if (XFS_IS_REALTIME_INODE(src) || XFS_IS_REALTIME_INODE(dest))
  		goto out_unlock;

             reply index

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-11 23:19 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-04-19  0:49 Stephen Rothwell
2021-04-20 16:40 ` Darrick J. Wong
2021-04-12  2:22 Stephen Rothwell
2021-04-13 15:20 ` Darrick J. Wong
2018-10-31  0:52 Stephen Rothwell
2018-10-31  1:12 ` Dave Chinner
2015-11-10 23:21 Stephen Rothwell
2015-04-14  1:34 Stephen Rothwell
2015-04-13  1:57 Stephen Rothwell
2015-04-13  2:12 ` Dave Chinner
2011-07-18  3:36 Stephen Rothwell
2011-07-19  1:29 ` Dave Chinner
2010-07-26  1:51 Stephen Rothwell
2010-07-26  3:59 ` Dave Chinner
2010-07-26  4:05   ` Stephen Rothwell
2010-07-05  0:02 Stephen Rothwell
2010-07-07  1:48 ` Christoph Hellwig
2010-07-07  3:50   ` Stephen Rothwell
2010-08-04  1:54 ` 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=20161212101945.31f29cb1@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=darrick.wong@oracle.com \
    --cc=david@fromorbit.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=viro@ZenIV.linux.org.uk \
    /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

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git