aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2009-03-11 11:02:04 -0400
committerJan Kara <jack@suse.cz>2009-04-02 06:29:55 -0400
commit225feded89d447c2ab76e38e67ef56860c5bb60f (patch)
treef804191425cc2be8c1e6fec6e772b9b201086c92
parent1197e4dfcf4ac17d763a59e5de1d4d4b9781a555 (diff)
udf: Some type fixes and cleanups
Make udf_check_valid() return 1 if the validity check passed and 0 otherwise. So far it was the other way around which was a bit confusing. Also make udf_vrs() return loff_t which is really the type it should return (not int). Signed-off-by: Jan Kara <jack@suse.cz>
-rw-r--r--fs/udf/super.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c
index f8fece43f6c6..f4ef5560675f 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -83,8 +83,6 @@ static int udf_fill_super(struct super_block *, void *, int);
83static void udf_put_super(struct super_block *); 83static void udf_put_super(struct super_block *);
84static void udf_write_super(struct super_block *); 84static void udf_write_super(struct super_block *);
85static int udf_remount_fs(struct super_block *, int *, char *); 85static int udf_remount_fs(struct super_block *, int *, char *);
86static int udf_check_valid(struct super_block *, int, int);
87static int udf_vrs(struct super_block *sb, int silent);
88static void udf_load_logicalvolint(struct super_block *, struct kernel_extent_ad); 86static void udf_load_logicalvolint(struct super_block *, struct kernel_extent_ad);
89static int udf_find_fileset(struct super_block *, struct kernel_lb_addr *, 87static int udf_find_fileset(struct super_block *, struct kernel_lb_addr *,
90 struct kernel_lb_addr *); 88 struct kernel_lb_addr *);
@@ -610,7 +608,7 @@ static int udf_remount_fs(struct super_block *sb, int *flags, char *options)
610 return 0; 608 return 0;
611} 609}
612 610
613static int udf_vrs(struct super_block *sb, int silent) 611static loff_t udf_vrs(struct super_block *sb, int silent)
614{ 612{
615 struct volStructDesc *vsd = NULL; 613 struct volStructDesc *vsd = NULL;
616 loff_t sector = 32768; 614 loff_t sector = 32768;
@@ -1706,7 +1704,7 @@ static noinline int udf_process_sequence(struct super_block *sb, long block,
1706 */ 1704 */
1707static int udf_check_valid(struct super_block *sb, int novrs, int silent) 1705static int udf_check_valid(struct super_block *sb, int novrs, int silent)
1708{ 1706{
1709 long block; 1707 loff_t block;
1710 struct udf_sb_info *sbi = UDF_SB(sb); 1708 struct udf_sb_info *sbi = UDF_SB(sb);
1711 1709
1712 if (novrs) { 1710 if (novrs) {
@@ -1721,7 +1719,7 @@ static int udf_check_valid(struct super_block *sb, int novrs, int silent)
1721 "disc. Skipping validity check\n"); 1719 "disc. Skipping validity check\n");
1722 if (block && !sbi->s_last_block) 1720 if (block && !sbi->s_last_block)
1723 sbi->s_last_block = udf_get_last_block(sb); 1721 sbi->s_last_block = udf_get_last_block(sb);
1724 return !block; 1722 return !!block;
1725} 1723}
1726 1724
1727static int udf_check_volume(struct super_block *sb, 1725static int udf_check_volume(struct super_block *sb,
@@ -1735,7 +1733,7 @@ static int udf_check_volume(struct super_block *sb,
1735 return 0; 1733 return 0;
1736 } 1734 }
1737 sbi->s_last_block = uopt->lastblock; 1735 sbi->s_last_block = uopt->lastblock;
1738 if (udf_check_valid(sb, uopt->novrs, silent)) { 1736 if (!udf_check_valid(sb, uopt->novrs, silent)) {
1739 if (!silent) 1737 if (!silent)
1740 printk(KERN_WARNING "UDF-fs: No VRS found\n"); 1738 printk(KERN_WARNING "UDF-fs: No VRS found\n");
1741 return 0; 1739 return 0;