From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752948AbbDMCM2 (ORCPT ); Sun, 12 Apr 2015 22:12:28 -0400 Received: from ipmail07.adl2.internode.on.net ([150.101.137.131]:9734 "EHLO ipmail07.adl2.internode.on.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752535AbbDMCM1 (ORCPT ); Sun, 12 Apr 2015 22:12:27 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2CJBgDfJCtV/8+HLHlcgwyBLrMRBpkhBAICgSxNAQEBAQEBfoQgAQEEJxMcIxAIAw4KCSUPBSUDIROIKctGAQEBBwIgGIV4hRuEfAeELQWbGpRtIoQBLDGCQwEBAQ Date: Mon, 13 Apr 2015 12:12:11 +1000 From: Dave Chinner To: Stephen Rothwell Cc: Al Viro , Ben Myers , xfs@oss.sgi.com, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, David Howells Subject: Re: linux-next: manual merge of the vfs tree with the xfs tree Message-ID: <20150413021211.GP15810@dastard> References: <20150413115737.6ec67270@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150413115737.6ec67270@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Apr 13, 2015 at 11:57:37AM +1000, Stephen Rothwell wrote: > Hi Al, > > Today's linux-next merge of the vfs tree got a conflict in > fs/xfs/xfs_iops.c between commit e8e9ad42c1f1 ("xfs: take i_mmap_lock > on extent manipulation operations") from the xfs tree and commit > 5dd3dc06371a ("VFS: normal filesystems (and lustre): d_inode() > annotations") from the vfs tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au > > diff --cc fs/xfs/xfs_iops.c > index 015d6a366b16,54b95232d946..000000000000 > --- a/fs/xfs/xfs_iops.c > +++ b/fs/xfs/xfs_iops.c > @@@ -953,13 -975,9 +953,13 @@@ xfs_vn_setattr > uint iolock = XFS_IOLOCK_EXCL; > > xfs_ilock(ip, iolock); > - error = xfs_break_layouts(dentry->d_inode, &iolock); > + error = xfs_break_layouts(d_inode(dentry), &iolock); > - if (!error) > + if (!error) { > + xfs_ilock(ip, XFS_MMAPLOCK_EXCL); > + iolock |= XFS_MMAPLOCK_EXCL; > + > error = xfs_setattr_size(ip, iattr); > + } > xfs_iunlock(ip, iolock); > } else { > error = xfs_setattr_nonsize(ip, iattr, 0); Fix looks good. FWIW, I'm just about to commit a locking fix which adds a parameter to xfs_break_layouts() so you might need to rework this again tomorrow... Cheers, Dave. -- Dave Chinner david@fromorbit.com