Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 140018
b: refs/heads/master
c: 225fede
h: refs/heads/master
v: v3
  • Loading branch information
Jan Kara committed Apr 2, 2009
1 parent 3c69e5f commit a1a4fcc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1197e4dfcf4ac17d763a59e5de1d4d4b9781a555
refs/heads/master: 225feded89d447c2ab76e38e67ef56860c5bb60f
10 changes: 4 additions & 6 deletions trunk/fs/udf/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 *);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand All @@ -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,
Expand All @@ -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;
Expand Down

0 comments on commit a1a4fcc

Please sign in to comment.