summaryrefslogtreecommitdiffstats
path: root/fs/udf
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2009-03-11 16:02:04 +0100
committerJan Kara <jack@suse.cz>2009-04-02 12:29:55 +0200
commit225feded89d447c2ab76e38e67ef56860c5bb60f (patch)
treef804191425cc2be8c1e6fec6e772b9b201086c92 /fs/udf
parent1197e4dfcf4ac17d763a59e5de1d4d4b9781a555 (diff)
downloadlinux-225feded89d447c2ab76e38e67ef56860c5bb60f.tar.gz
linux-225feded89d447c2ab76e38e67ef56860c5bb60f.tar.bz2
linux-225feded89d447c2ab76e38e67ef56860c5bb60f.zip
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>
Diffstat (limited to 'fs/udf')
-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);
static void udf_put_super(struct super_block *);
static void udf_write_super(struct super_block *);
static int udf_remount_fs(struct super_block *, int *, char *);
-static int udf_check_valid(struct super_block *, int, int);
-static int udf_vrs(struct super_block *sb, int silent);
static void udf_load_logicalvolint(struct super_block *, struct kernel_extent_ad);
static int udf_find_fileset(struct super_block *, struct kernel_lb_addr *,
struct kernel_lb_addr *);
@@ -610,7 +608,7 @@ static int udf_remount_fs(struct super_block *sb, int *flags, char *options)
return 0;
}
-static int udf_vrs(struct super_block *sb, int silent)
+static loff_t udf_vrs(struct super_block *sb, int silent)
{
struct volStructDesc *vsd = NULL;
loff_t sector = 32768;
@@ -1706,7 +1704,7 @@ static noinline int udf_process_sequence(struct super_block *sb, long block,
*/
static int udf_check_valid(struct super_block *sb, int novrs, int silent)
{
- long block;
+ loff_t block;
struct udf_sb_info *sbi = UDF_SB(sb);
if (novrs) {
@@ -1721,7 +1719,7 @@ static int udf_check_valid(struct super_block *sb, int novrs, int silent)
"disc. Skipping validity check\n");
if (block && !sbi->s_last_block)
sbi->s_last_block = udf_get_last_block(sb);
- return !block;
+ return !!block;
}
static int udf_check_volume(struct super_block *sb,
@@ -1735,7 +1733,7 @@ static int udf_check_volume(struct super_block *sb,
return 0;
}
sbi->s_last_block = uopt->lastblock;
- if (udf_check_valid(sb, uopt->novrs, silent)) {
+ if (!udf_check_valid(sb, uopt->novrs, silent)) {
if (!silent)
printk(KERN_WARNING "UDF-fs: No VRS found\n");
return 0;