[U-Boot] [PATCH] ubifs: Fix ubifsload when using ZLIB

[Jamie Lentin]

On Wed, 05 Sep 2012 09:58:07 +0100, Veli-Pekka Peltola  
<veli-pekka.peltola at bluegiga.com> wrote:

> Using ZLIB compression with UBIFS fails if last data node is not a size  
> of
> UBIFS_BLOCK_SIZE (4096 bytes).
>
> Easiest way to test this is trying to read a file smaller than 4k:
> => ubifsload 41000000 /etc/fstab
> Loading file '/etc/fstab' to addr 0x41000000 with size 704  
> (0x000002c0)...
> UBIFS error (pid 0): read_block: bad data node (block 0, inode 2506)
> UBIFS error (pid 0): do_readpage: cannot read page 0 of inode 2506,  
> error -22
> Error reading file '/etc/fstab'
> /etc/fstab not found!
> exit not allowed from main input shell.
> =>
>
> With this patch:
>
> => ubifsload 41000000 /etc/fstab
> Loading file '/etc/fstab' to addr 0x41000000 with size 704  
> (0x000002c0)...
> Done
> =>
>
> Signed-off-by: Veli-Pekka Peltola <veli-pekka.peltola at bluegiga.com>
Tested-by: Jamie Lentin <jm at lentin.co.uk>

This was affecting me also (UBIFS using ZLIB, on NAND of Kirkwood-based  
DNS-320), and your patch seems to have fixed loading small files. Thanks!

> ---
>  fs/ubifs/ubifs.c |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
> index c68802b..6a68437 100644
> --- a/fs/ubifs/ubifs.c
> +++ b/fs/ubifs/ubifs.c
> @@ -37,8 +37,7 @@ DECLARE_GLOBAL_DATA_PTR;
>  static int gzip_decompress(const unsigned char *in, size_t in_len,
>  			   unsigned char *out, size_t *out_len)
>  {
> -	unsigned long len = in_len;
> -	return zunzip(out, *out_len, (unsigned char *)in, &len, 0, 0);
> +	return zunzip(out, *out_len, (unsigned char *)in, (long unsigned int  
> *)out_len, 0, 0);
>  }
> /* Fake description object for the "none" compressor */


-- 
Jamie Lentin