Am 18.04.2016 um 09:55 schrieb Yoshinori Sato:
> Signed-off-by: Yoshinori Sato <ys...@users.sourceforge.jp>
> ---
> common/env_ext4.c | 20 +++++++++++---------
> 1 file changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/common/env_ext4.c b/common/env_ext4.c
> index ce748ed..5683890 100644
> --- a/common/env_ext4.c
> +++ b/common/env_ext4.c
> @@ -25,6 +25,7 @@
> #include <environment.h>
> #include <linux/stddef.h>
> #include <malloc.h>
> +#include <memalign.h>
> #include <search.h>
> #include <errno.h>
> #include <ext4fs.h>
> @@ -49,7 +50,7 @@ int env_init(void)
> int saveenv(void)
> {
> env_t env_new;
> - block_dev_desc_t *dev_desc = NULL;
> + struct blk_desc *dev_desc = NULL;
> disk_partition_t info;
> int dev, part;
> int err;
> @@ -58,13 +59,13 @@ int saveenv(void)
> if (err)
> return err;
>
> - part = get_device_and_partition(EXT4_ENV_INTERFACE,
> + part = blk_get_device_part_str(EXT4_ENV_INTERFACE,
> EXT4_ENV_DEVICE_AND_PART,
> &dev_desc, &info, 1);
Below you adjusted the indentation, here you didn't?
While at it, you could drop the trailing full stop from the subject.
Regards,
Andreas
> if (part < 0)
> return 1;
>
> - dev = dev_desc->dev;
> + dev = dev_desc->devnum;
> ext4fs_set_blk_dev(dev_desc, &info);
>
> if (!ext4fs_mount(info.size)) {
> @@ -90,18 +91,19 @@ int saveenv(void)
> void env_relocate_spec(void)
> {
> ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
> - block_dev_desc_t *dev_desc = NULL;
> + struct blk_desc *dev_desc = NULL;
> disk_partition_t info;
> int dev, part;
> int err;
> + long long int actread;
>
> - part = get_device_and_partition(EXT4_ENV_INTERFACE,
> - EXT4_ENV_DEVICE_AND_PART,
> - &dev_desc, &info, 1);
> + part = blk_get_device_part_str(EXT4_ENV_INTERFACE,
> + EXT4_ENV_DEVICE_AND_PART,
> + &dev_desc, &info, 1);
> if (part < 0)
> goto err_env_relocate;
>
> - dev = dev_desc->dev;
> + dev = dev_desc->devnum;
> ext4fs_set_blk_dev(dev_desc, &info);
>
> if (!ext4fs_mount(info.size)) {
> @@ -110,7 +112,7 @@ void env_relocate_spec(void)
> goto err_env_relocate;
> }
>
> - err = ext4_read_file(EXT4_ENV_FILE, buf, 0, CONFIG_ENV_SIZE);
> + err = ext4_read_file(EXT4_ENV_FILE, buf, 0, CONFIG_ENV_SIZE, &actread);
> ext4fs_close();
>
> if (err == -1) {
--
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
