fs/ext4: fix log2blksz un-initialized error, by cacaulating its value from blksz
authorLan Yixun (dlan) <dennis.yxun@gmail.com>
Sat, 20 Jul 2013 00:17:59 +0000 (08:17 +0800)
committerTom Rini <trini@ti.com>
Mon, 22 Jul 2013 14:09:56 +0000 (10:09 -0400)
The problem here is that uboot can't mount ext4 filesystem with
commit "50ce4c07df1" applied. We use hard-coded "SECTOR_SIZE"(512)
before this commit, now we introduce (block_dev_desc_t *)->log2blksz
to replace this macro. And after we calling do_ls()->fs_set_blk_dev(),
the variable log2blksz is not initialized, which it's not correct.

And this patch try to solve the problem by caculating the value of
log2blksz from variable blksz.

disk/part.c

index d73625c4434c622a4a8d3e0ed78e41667b6eabf5..9400a9756427e327238f350008cf54cf8201f8d2 100644 (file)
@@ -548,6 +548,8 @@ int get_device_and_partition(const char *ifname, const char *dev_part_str,
                        goto cleanup;
                }
 
+               (*dev_desc)->log2blksz = LOG2((*dev_desc)->blksz);
+
                info->start = 0;
                info->size = (*dev_desc)->lba;
                info->blksz = (*dev_desc)->blksz;
@@ -631,6 +633,8 @@ int get_device_and_partition(const char *ifname, const char *dev_part_str,
                goto cleanup;
        }
 
+       (*dev_desc)->log2blksz = LOG2((*dev_desc)->blksz);
+
        ret = part;
        goto cleanup;