lkml.org 
[lkml]   [2013]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the vfs tree with the aio-direct tree
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
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/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 */
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-09-05 05:21    [W:0.019 / U:0.628 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site