diff --git a/[refs] b/[refs] index 1d6b0edddcf0..fd41263c2d80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da88ba17de990a4b0d18ecde2c40355700888750 +refs/heads/master: edad01e2a1c527af3baf22dc6977aeb058881150 diff --git a/trunk/fs/fuse/inode.c b/trunk/fs/fuse/inode.c index 9804c0cdcb42..cc5efc13496a 100644 --- a/trunk/fs/fuse/inode.c +++ b/trunk/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)