linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dave Chinner <david@fromorbit.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>,
	linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: Re: an iomap-based direct I/O implementation V3
Date: Wed, 23 Nov 2016 11:02:04 +1100	[thread overview]
Message-ID: <20161123000204.GO31101@dastard> (raw)
In-Reply-To: <fe3fa405-7295-1a86-0e78-85be65d9edba@kernel.dk>

On Tue, Nov 22, 2016 at 04:12:56PM -0700, Jens Axboe wrote:
> On 11/22/2016 03:52 PM, Dave Chinner wrote:
> >On Sun, Nov 13, 2016 at 08:07:29PM +0100, Christoph Hellwig wrote:
> >>Hi all,
> >>
> >>this series adds a new direct I/O implementation based on the iomap
> >>interface, and switches XFS to use it.
> >>
> >>The first two patches are a resend of my earlier series to remove the
> >>XFS iolock.  They are needed for the lockdep assert in the new iomap
> >>code.
> >>
> >>The rest implements a new iomap_dio_rw direct I/O implementation and
> >>switches XFS to use it.
> >>
> >>Note that this series is on top of a merge of the XFS for-next
> >>tree with the block tree, which has a new helper needed for this
> >>implementation.  This is the block tree it's on top of:
> >>
> >>    git://git.kernel.dk/linux-block for-4.10/block
> >
> >This tree fails compilation for me.
> >
> >block/blk-flush.c: In function "flush_data_end_io":
> >block/blk-flush.c:369:20: error: "REQ_STARTED" undeclared (first use in this function)
> >  rq->cmd_flags &= ~REQ_STARTED;
> >                    ^~~~~~~~~~~
> >block/blk-flush.c:369:20: note: each undeclared identifier is reported only once for each function it appears in
> >
> >Should be RQF_STARTED, right?
> 
> My branch is fine, I'm guessing it's Christophs merge with master that
> broke things.

No, I merged an hour old for-4.10/block into a pristine 4.9-rc6 tree
and got this error.

> The blk-flush.c thing doesn't throw a merge conflict, but
> you still have to resolve it...

I've never seen an unreported merge problem like this before - if
there are hunks being silently dropped on the floor during a merge,
then I'd say we have a git bug.... Indeed, there were reported
conflicts I resolved, but there was nothing that pointed me at the
above being a merge issue until after I'd committed the merge and
went to build the result...

> >>To make everyones life easie I also have a git tree with the merge
> >>plus the patches in this series available here:
> >>
> >>    git://git.infradead.org/users/hch/vfs.git iomap-dio.3
> >
> >Is there a stable topic branch with all the relevant block changes
> >in it? I'd like to pull this into the XFS tree so I can test it, but
> >these things need to be pulled from the block tree:
> >
> >	- REQ_IDLE is undefined
> >	- bio_iov_iter_get_pages() is undefined
> >	- blk_mq_poll() is undefined
> >
> >Having these in a stable topic branch (or set of branches) would
> >make this much easier for me....
> 
> You can use my for-next, it has the block/fs changes and merged with
> whatever should conflict with current Linus.

I don't want to pull the entire block tree into the XFS tree, just
the bare minimum needed to resolve the missing functionality this
patchset requires. We do this regularly with filesystem trees to
resolve cross-fs development dependencies....

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

  reply	other threads:[~2016-11-23  0:04 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-13 19:07 an iomap-based direct I/O implementation V3 Christoph Hellwig
2016-11-13 19:07 ` [PATCH 1/5] locking/lockdep: Provide a type check for lock_is_held Christoph Hellwig
2016-11-13 19:07 ` [PATCH 2/5] xfs: remove i_iolock and use i_rwsem in the VFS inode instead Christoph Hellwig
2016-11-15 15:34   ` Brian Foster
2016-11-15 16:52     ` Christoph Hellwig
2016-11-13 19:07 ` [PATCH 3/5] fs: make sb_init_dio_done_wq available outside of direct-io.c Christoph Hellwig
2016-11-13 19:07 ` [PATCH 4/5] iomap: implement direct I/O Christoph Hellwig
2016-11-13 19:07 ` [PATCH 5/5] xfs: use iomap_dio_rw Christoph Hellwig
2016-11-15 15:34   ` Brian Foster
2016-11-15 16:52     ` Christoph Hellwig
2016-11-21 16:52 ` an iomap-based direct I/O implementation V3 Christoph Hellwig
2016-11-21 22:34   ` Dave Chinner
2016-11-22 22:52 ` Dave Chinner
2016-11-22 23:12   ` Jens Axboe
2016-11-23  0:02     ` Dave Chinner [this message]
2016-11-23  0:40       ` Jens Axboe
2016-11-23  8:36         ` Christoph Hellwig
2016-11-27 23:16           ` Dave Chinner

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=20161123000204.GO31101@dastard \
    --to=david@fromorbit.com \
    --cc=axboe@kernel.dk \
    --cc=hch@lst.de \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    /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).