diff options
Diffstat (limited to 'fs/udf/super.c')
-rw-r--r-- | fs/udf/super.c | 10 |
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); | |||
83 | static void udf_put_super(struct super_block *); | 83 | static void udf_put_super(struct super_block *); |
84 | static void udf_write_super(struct super_block *); | 84 | static void udf_write_super(struct super_block *); |
85 | static int udf_remount_fs(struct super_block *, int *, char *); | 85 | static int udf_remount_fs(struct super_block *, int *, char *); |
86 | static int udf_check_valid(struct super_block *, int, int); | ||
87 | static int udf_vrs(struct super_block *sb, int silent); | ||
88 | static void udf_load_logicalvolint(struct super_block *, struct kernel_extent_ad); | 86 | static void udf_load_logicalvolint(struct super_block *, struct kernel_extent_ad); |
89 | static int udf_find_fileset(struct super_block *, struct kernel_lb_addr *, | 87 | static 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 | ||
613 | static int udf_vrs(struct super_block *sb, int silent) | 611 | static 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 | */ |
1707 | static int udf_check_valid(struct super_block *sb, int novrs, int silent) | 1705 | static 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 | ||
1727 | static int udf_check_volume(struct super_block *sb, | 1725 | static 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; |