From: Andrew Morton coding style fixes Cc: Evgeniy Dushistov Cc: Mark Fortescue Signed-off-by: Andrew Morton --- fs/ufs/super.c | 11 ++++++----- fs/ufs/util.h | 6 ++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff -puN fs/ufs/super.c~add-in-sunos-41x-compatible-mode-for-ufs-fix fs/ufs/super.c --- a/fs/ufs/super.c~add-in-sunos-41x-compatible-mode-for-ufs-fix +++ a/fs/ufs/super.c @@ -341,8 +341,8 @@ static int ufs_parse_options (char * opt ufs_set_opt (*mount_options, UFSTYPE_SUN); break; case Opt_type_sunos: - ufs_clear_opt (*mount_options, UFSTYPE); - ufs_set_opt (*mount_options, UFSTYPE_SUNOS); + ufs_clear_opt(*mount_options, UFSTYPE); + ufs_set_opt(*mount_options, UFSTYPE_SUNOS); break; case Opt_type_44bsd: ufs_clear_opt (*mount_options, UFSTYPE); @@ -659,8 +659,8 @@ static int ufs_fill_super(struct super_b ufs_set_opt (sbi->s_mount_opt, UFSTYPE_OLD); } - sbi->s_uspi = uspi = - kzalloc (sizeof(struct ufs_sb_private_info), GFP_KERNEL); + uspi = kzalloc(sizeof(struct ufs_sb_private_info), GFP_KERNEL); + sbi->s_uspi = uspi; if (!uspi) goto failed; uspi->s_dirblksize = UFS_SECTOR_SIZE; @@ -706,7 +706,8 @@ static int ufs_fill_super(struct super_b uspi->s_fsize = block_size = 1024; uspi->s_fmask = ~(1024 - 1); uspi->s_fshift = 10; - uspi->s_sbsize = super_block_size = 2048; + uspi->s_sbsize = 2048; + super_block_size = 2048; uspi->s_sbbase = 0; uspi->s_maxsymlinklen = 0; /* Not supported on disk */ flags |= UFS_DE_OLD | UFS_UID_OLD | UFS_ST_SUNOS | UFS_CG_SUN; diff -puN fs/ufs/util.h~add-in-sunos-41x-compatible-mode-for-ufs-fix fs/ufs/util.h --- a/fs/ufs/util.h~add-in-sunos-41x-compatible-mode-for-ufs-fix +++ a/fs/ufs/util.h @@ -212,7 +212,8 @@ ufs_set_inode_uid(struct super_block *sb break; case UFS_UID_EFT: inode->ui_u3.ui_sun.ui_uid = cpu_to_fs32(sb, value); - if (value > 0xFFFF) value = 0xFFFF; + if (value > 0xFFFF) + value = 0xFFFF; /* Fall through */ default: inode->ui_u1.oldids.ui_suid = cpu_to_fs16(sb, value); @@ -245,7 +246,8 @@ ufs_set_inode_gid(struct super_block *sb break; case UFS_UID_EFT: inode->ui_u3.ui_sun.ui_gid = cpu_to_fs32(sb, value); - if (value > 0xFFFF) value = 0xFFFF; + if (value > 0xFFFF) + value = 0xFFFF; /* Fall through */ default: inode->ui_u1.oldids.ui_sgid = cpu_to_fs16(sb, value); _