Re: [PATCH] fuse: ->fs_flags fixlet

[Miklos Szeredi <miklos@szeredi.hu>]

> fs/fuse/inode.c:658:3: error: Initializer entry defined twice
> fs/fuse/inode.c:661:3:   also defined here

Duh, that's a stupid conflict.  I wonder why I don't get this compile
error...

> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

Acked-by: Miklos Szeredi <mszeredi@suse.cz>

Andrew, please send this for 2.6.22.

There's another one, which is -mm only.  I'll post a patch.

Thanks,
Miklos

> ---
> 
>  fs/fuse/inode.c |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> --- a/fs/fuse/inode.c
> +++ b/fs/fuse/inode.c
> @@ -655,10 +655,9 @@ static int fuse_get_sb_blk(struct file_system_type *fs_type,
>  static struct file_system_type fuseblk_fs_type = {
>  	.owner		= THIS_MODULE,
>  	.name		= "fuseblk",
> -	.fs_flags	= FS_HAS_SUBTYPE,
>  	.get_sb		= fuse_get_sb_blk,
>  	.kill_sb	= kill_block_super,
> -	.fs_flags	= FS_REQUIRES_DEV,
> +	.fs_flags	= FS_REQUIRES_DEV | FS_HAS_SUBTYPE,
>  };
>  
>  static inline int register_fuseblk(void)
> 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/