archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Al Viro <>
	Dave Kleikamp <>,
	Christoph Hellwig <>, Jan Kara <>
Subject: linux-next: manual merge of the vfs tree with the aio-direct tree
Date: Thu, 5 Sep 2013 13:02:09 +1000	[thread overview]
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 1072 bytes --]

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in fs/direct-io.c
between commit 8f2a7fbb9b10 ("dio: add bio_vec support to
__blockdev_direct_IO()") from the aio-direct tree and commit 7b7a8665edd8
("direct-io: Implement generic deferred AIO completions") from the vfs

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell          

diff --cc fs/direct-io.c
index 75a3989,1782023..0000000
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@@ -127,7 -127,7 +127,8 @@@ struct dio 
  	spinlock_t bio_lock;		/* protects BIO fields below */
  	int page_errors;		/* errno from get_user_pages() */
  	int is_async;			/* is IO async ? */
 +	int should_dirty;		/* should we mark read pages dirty? */
+ 	bool defer_completion;		/* defer AIO completion to workqueue? */
  	int io_error;			/* IO error in completion path */
  	unsigned long refcount;		/* direct_io_worker() and bios */
  	struct bio *bio_list;		/* singly linked via bi_private */

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2013-09-05  3:02 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-05  3:02 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-09-18  0:56 linux-next: manual merge of the vfs tree with the aio-direct tree Stephen Rothwell
2013-09-18  2:00 ` Al Viro
2013-09-18  3:25   ` Dave Kleikamp
2013-09-18 17:06   ` Zach Brown
2013-09-05  2: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:

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

  git send-email \ \ \ \ \ \ \ \ \

* 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).