summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2013-05-23 10:22:10 +0000
committerTom Rini <trini@ti.com>2013-05-24 10:04:23 -0400
commitc28cbfa1a89cae2c0cb13144c8123345d61fdc87 (patch)
tree0f39e0b94f74e9823bbc3cc7c845ac5e360d44a4 /fs
parent24c185cf58a5bef1e0401a0f7e70526d6d9078c7 (diff)
ext4: assign get_fs()->dev_desc before using it
Commit 50ce4c0 "fs/ext4: Support device block sizes != 512 bytes" modified ext4fs_set_blk_dev() to calculate total_sect based on get_fs()->dev_desc->log2blksz rather than SECTOR_SIZE. However, this value wasn't yet assigned. Move the assignment earlier so the code doesn't crash or hang. Cc: Egbert Eich <eich@suse.com> Tested-by: Tom Rini <trini@ti.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/dev.c b/fs/ext4/dev.c
index 3e993cc220f..81b7633b59c 100644
--- a/fs/ext4/dev.c
+++ b/fs/ext4/dev.c
@@ -51,11 +51,11 @@ void ext4fs_set_blk_dev(block_dev_desc_t *rbdd, disk_partition_t *info)
{
assert(rbdd->blksz == (1 << rbdd->log2blksz));
ext4fs_block_dev_desc = rbdd;
+ get_fs()->dev_desc = rbdd;
part_info = info;
part_offset = info->start;
get_fs()->total_sect = (info->size * info->blksz) >>
get_fs()->dev_desc->log2blksz;
- get_fs()->dev_desc = rbdd;
}
int ext4fs_devread(int sector, int byte_offset, int byte_len, char *buf)