From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Darrick J. Wong" <darrick.wong@oracle.com>,
David Chinner <david@fromorbit.com>,
linux-xfs@vger.kernel.org
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Andreas Gruenbacher <agruenba@redhat.com>,
Bob Peterson <rpeterso@redhat.com>,
Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: manual merge of the xfs tree with Linus' tree
Date: Tue, 5 Jun 2018 10:38:23 +1000 [thread overview]
Message-ID: <20180605103823.2ce02805@canb.auug.org.au> (raw)
In-Reply-To: <20180605103403.3e5b2c91@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2539 bytes --]
Hi all,
On Tue, 5 Jun 2018 10:34:03 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the xfs tree got a conflict in:
>
> fs/gfs2/bmap.c
>
> between commit:
>
> 628e366df11c ("gfs2: Iomap cleanups and improvements")
>
> from Linus' tree and commit:
>
> 7ee66c03e40a ("iomap: move IOMAP_F_BOUNDARY to gfs2")
>
> from the xfs tree.
>
> I fixed it up (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.
Forgot the diff :-(
--
Cheers,
Stephen Rothwell
diff --cc fs/gfs2/bmap.c
index a7b586e02693,8efa6297e19c..000000000000
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@@ -767,12 -680,13 +767,13 @@@ static void gfs2_stuffed_iomap(struct i
sizeof(struct gfs2_dinode);
iomap->offset = 0;
iomap->length = i_size_read(inode);
- iomap->type = IOMAP_MAPPED;
- iomap->flags = IOMAP_F_DATA_INLINE;
+ iomap->type = IOMAP_INLINE;
}
+ #define IOMAP_F_GFS2_BOUNDARY IOMAP_F_PRIVATE
+
/**
- * gfs2_iomap_begin - Map blocks from an inode to disk blocks
+ * gfs2_iomap_get - Map blocks from an inode to disk blocks
* @inode: The inode
* @pos: Starting position in bytes
* @length: Length to map, in bytes
@@@ -838,20 -770,20 +839,20 @@@ static int gfs2_iomap_get(struct inode
if (*ptr == 0)
goto do_alloc;
- iomap->type = IOMAP_MAPPED;
- iomap->addr = be64_to_cpu(*ptr) << inode->i_blkbits;
+ bh = mp->mp_bh[ip->i_height - 1];
+ len = gfs2_extent_length(bh->b_data, bh->b_size, ptr, len, &eob);
- bh = mp.mp_bh[ip->i_height - 1];
- len = gfs2_extent_length(bh->b_data, bh->b_size, ptr, lend - lblock, &eob);
+ iomap->addr = be64_to_cpu(*ptr) << inode->i_blkbits;
+ iomap->length = len << inode->i_blkbits;
+ iomap->type = IOMAP_MAPPED;
+ iomap->flags = IOMAP_F_MERGED;
if (eob)
- iomap->flags |= IOMAP_F_BOUNDARY;
+ iomap->flags |= IOMAP_F_GFS2_BOUNDARY;
- iomap->length = (u64)len << inode->i_blkbits;
-out_release:
- release_metapath(&mp);
- bmap_unlock(ip, flags & IOMAP_WRITE);
out:
- trace_gfs2_iomap_end(ip, iomap, ret);
+ iomap->bdev = inode->i_sb->s_bdev;
+unlock:
+ up_read(&ip->i_rw_mutex);
return ret;
do_alloc:
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2018-06-05 0:38 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-05 0:34 linux-next: manual merge of the xfs tree with Linus' tree Stephen Rothwell
2018-06-05 0:38 ` Stephen Rothwell [this message]
2018-06-05 0:59 ` Dave Chinner
2018-06-05 1:13 ` Andreas Grünbacher
2018-06-05 1:25 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-10-31 0:41 Stephen Rothwell
2022-03-30 22:00 Stephen Rothwell
2022-01-17 22:30 Stephen Rothwell
2022-01-18 18:17 ` Darrick J. Wong
2019-07-16 23:36 Stephen Rothwell
2018-10-31 0:22 Stephen Rothwell
2018-10-31 1:05 ` Dave Chinner
2017-12-21 22:50 Stephen Rothwell
2017-12-21 23:01 ` Darrick J. Wong
2016-07-21 1:07 Stephen Rothwell
2016-07-21 1:35 ` Dave Chinner
2015-04-20 2:24 Stephen Rothwell
2012-01-03 1:06 Stephen Rothwell
2012-01-03 1:34 ` Dave Chinner
2011-09-15 2:30 Stephen Rothwell
2011-09-15 11:05 ` Christoph Hellwig
2011-03-28 1:21 Stephen Rothwell
2009-08-18 0:12 Stephen Rothwell
2009-08-18 6:49 ` Felix Blyakher
2009-08-18 7:17 ` 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=20180605103823.2ce02805@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=agruenba@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=rpeterso@redhat.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).