From: Andrew Morton fs/ext3/super.c: In function `ext3_show_options': fs/ext3/super.c:516: warning: unused variable `sbi' Signed-off-by: Andrew Morton --- fs/ext3/super.c | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff -puN fs/ext3/super.c~ext3_show_options-warning-fix fs/ext3/super.c --- devel/fs/ext3/super.c~ext3_show_options-warning-fix 2005-10-15 22:52:21.000000000 -0700 +++ devel-akpm/fs/ext3/super.c 2005-10-15 22:53:15.000000000 -0700 @@ -516,7 +516,6 @@ static void ext3_clear_inode(struct inod static int ext3_show_options(struct seq_file *seq, struct vfsmount *vfs) { struct super_block *sb = vfs->mnt_sb; - struct ext3_sb_info *sbi = EXT3_SB(sb); if (test_opt(sb, DATA_FLAGS) == EXT3_MOUNT_JOURNAL_DATA) seq_puts(seq, ",data=journal"); @@ -526,21 +525,27 @@ static int ext3_show_options(struct seq_ seq_puts(seq, ",data=writeback"); #if defined(CONFIG_QUOTA) - if (sbi->s_jquota_fmt) - seq_printf(seq, ",jqfmt=%s", - (sbi->s_jquota_fmt == QFMT_VFS_OLD) ? "vfsold": "vfsv0"); - - if (sbi->s_qf_names[USRQUOTA]) - seq_printf(seq, ",usrjquota=%s", sbi->s_qf_names[USRQUOTA]); - - if (sbi->s_qf_names[GRPQUOTA]) - seq_printf(seq, ",grpjquota=%s", sbi->s_qf_names[GRPQUOTA]); + { + struct ext3_sb_info *sbi = EXT3_SB(sb); + if (sbi->s_jquota_fmt) + seq_printf(seq, ",jqfmt=%s", + (sbi->s_jquota_fmt == QFMT_VFS_OLD) ? + "vfsold": "vfsv0"); + + if (sbi->s_qf_names[USRQUOTA]) + seq_printf(seq, ",usrjquota=%s", + sbi->s_qf_names[USRQUOTA]); + + if (sbi->s_qf_names[GRPQUOTA]) + seq_printf(seq, ",grpjquota=%s", + sbi->s_qf_names[GRPQUOTA]); - if (sbi->s_mount_opt & EXT3_MOUNT_USRQUOTA) - seq_puts(seq, ",usrquota"); + if (sbi->s_mount_opt & EXT3_MOUNT_USRQUOTA) + seq_puts(seq, ",usrquota"); - if (sbi->s_mount_opt & EXT3_MOUNT_GRPQUOTA) - seq_puts(seq, ",grpquota"); + if (sbi->s_mount_opt & EXT3_MOUNT_GRPQUOTA) + seq_puts(seq, ",grpquota"); + } #endif return 0; _