Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
include/linux/fs.h between commit 7b7a8665edd8 ("direct-io: Implement
generic deferred AIO completions") from the vfs tree and commit "dcache:
convert to use new lru list infrastructure" from the akpm tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell [email protected] diff --cc include/linux/fs.h index ee1a9b2,b778968..0000000 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@@ -1421,8 -1413,12 +1413,15 @@@ struct super_block /* Being remounted read-only */ int s_readonly_remount; + /* AIO completions deferred from interrupt context */ + struct workqueue_struct *s_dio_done_wq; ++ + /* + * Keep the lru lists last in the structure so they always sit on their + * own individual cachelines. + */ + struct list_lru s_dentry_lru ____cacheline_aligned_in_smp; + struct list_lru s_inode_lru ____cacheline_aligned_in_smp; }; extern struct timespec current_fs_time(struct super_block *sb);
pgp8GL30gp2H_.pgp
Description: PGP signature
