Messages in this thread | | | Date | Tue, 11 Nov 2014 17:55:53 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm-current tree with the ext3 tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in fs/ocfs2/inode.h between commit 1c92ec678f32 ("ocfs2: Convert to private i_dquot field") from the ext3 tree and commit eeb85794b87e ("ocfs2: fix leftover orphan entry caused by append O_DIRECT write crash") from the akpm-current 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/ocfs2/inode.h index ca3431ee7f24,1fdf4707e6d3..000000000000 --- a/fs/ocfs2/inode.h +++ b/fs/ocfs2/inode.h @@@ -81,7 -81,7 +81,9 @@@ struct ocfs2_inode_inf tid_t i_sync_tid; tid_t i_datasync_tid; + struct dquot *i_dquot[MAXQUOTAS]; ++ + wait_queue_head_t append_dio_wq; }; /* [unhandled content-type:application/pgp-signature] | |