lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

UBIFS: fix constants initialization

Browse Source 
The c->min_idx_lebs constant depends on c->old_idx_sz, which
is read from the master node. This means that we have to
initialize c->min_idx_lebs only after we have read the master
node.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
This commit is contained in:
Artem Bityutskiy
2008-12-27 19:18:00 +02:00
parent c8f915913a
commit 79807d075a
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
fs/ubifs/super.c
View File

@@ -602,7 +602,7 @@ static int bud_wbuf_callback(struct ubifs_info *c, int lnum, int free, int pad)
} }
/* /*
* init_constants_late - initialize UBIFS constants. * init_constants_sb - initialize UBIFS constants.
* @c: UBIFS file-system description object * @c: UBIFS file-system description object
* *
* This is a helper function which initializes various UBIFS constants after * This is a helper function which initializes various UBIFS constants after
@@ -610,7 +610,7 @@ static int bud_wbuf_callback(struct ubifs_info *c, int lnum, int free, int pad)
* makes sure they are all right. Returns zero in case of success and a * makes sure they are all right. Returns zero in case of success and a
* negative error code in case of failure. * negative error code in case of failure.
*/ */
static int init_constants_late(struct ubifs_info *c) static int init_constants_sb(struct ubifs_info *c)
{ {
int tmp, err; int tmp, err;
long long tmp64; long long tmp64;
@@ -687,6 +687,21 @@ static int init_constants_late(struct ubifs_info *c)
if (err) if (err)
return err; return err;
return 0;
}
/*
* init_constants_master - initialize UBIFS constants.
* @c: UBIFS file-system description object
*
* This is a helper function which initializes various UBIFS constants after
* the master node has been read. It also checks various UBIFS parameters and
* makes sure they are all right.
*/
static void init_constants_master(struct ubifs_info *c)
{
long long tmp64;
c->min_idx_lebs = ubifs_calc_min_idx_lebs(c); c->min_idx_lebs = ubifs_calc_min_idx_lebs(c);
/* /*
@@ -702,8 +717,6 @@ static int init_constants_late(struct ubifs_info *c)
tmp64 *= (long long)c->leb_size - c->leb_overhead; tmp64 *= (long long)c->leb_size - c->leb_overhead;
tmp64 = ubifs_reported_space(c, tmp64); tmp64 = ubifs_reported_space(c, tmp64);
c->block_cnt = tmp64 >> UBIFS_BLOCK_SHIFT; c->block_cnt = tmp64 >> UBIFS_BLOCK_SHIFT;
return 0;
} }
/** /**
@@ -1138,7 +1151,7 @@ static int mount_ubifs(struct ubifs_info *c)
goto out_free; goto out_free;
} }
err = init_constants_late(c); err = init_constants_sb(c);
if (err) if (err)
goto out_free; goto out_free;
@@ -1172,6 +1185,8 @@ static int mount_ubifs(struct ubifs_info *c)
if (err) if (err)
goto out_master; goto out_master;
init_constants_master(c);
if ((c->mst_node->flags & cpu_to_le32(UBIFS_MST_DIRTY)) != 0) { if ((c->mst_node->flags & cpu_to_le32(UBIFS_MST_DIRTY)) != 0) {
ubifs_msg("recovery needed"); ubifs_msg("recovery needed");
c->need_recovery = 1; c->need_recovery = 1;