lkml.org 
[lkml]   [2010]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRE: linux-next: manual merge of the block tree with the vfs tree
On Monday, May 17, 2010 8:04 PM, Stephen Rothwell wrote:
> Hi Jens,
>
> Today's linux-next merge of the block tree got a conflict in
> fs/fs-writeback.c between commit 1c9539ad0dd1c3c3964ea35d5a355a0ed19c39c7
> ("fs-writeback.c: bitfields should be unsigned") from the vfs tree and
> commit e913fc825dc685a444cb4c1d0f9d32f372f59861 ("writeback: fix
> WB_SYNC_NONE writeback from umount") from the block tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc fs/fs-writeback.c
> index 24e85ce,0f62957..0000000
> --- a/fs/fs-writeback.c
> +++ b/fs/fs-writeback.c
> @@@ -42,9 -42,10 +42,10 @@@ struct wb_writeback_args
> long nr_pages;
> struct super_block *sb;
> enum writeback_sync_modes sync_mode;
> - int for_kupdate:1;
> - int range_cyclic:1;
> - int for_background:1;
> - int sb_pinned:1;
> + unsigned int for_kupdate:1;
> + unsigned int range_cyclic:1;
> + unsigned int for_background:1;
> ++ unsigned int sb_pinned:1;
> };
>
> /*

Stephen,

Your fix looks good to me.

Regards,
Hartley

\
 
 \ /
  Last update: 2010-05-18 17:45    [W:0.038 / U:11.628 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site