Re: Transferring files over tftp

[Teresa Remmet <t.remmet@phytec.de>]

Hello Sascha,

Am Freitag, den 16.11.2018, 08:32 +0100 schrieb Sascha Hauer:

...

> 
> --------------------------------------8<-----------------------------
> -----
> 
> From bf3de3391c958c9c44fcfa54b2c1a6a29e68a5a4 Mon Sep 17 00:00:00
> 2001
> From: Sascha Hauer <s.hauer@pengutronix.de>
> Date: Fri, 16 Nov 2018 08:24:06 +0100
> Subject: [PATCH] fs: tftp: Make filesize a 64bit type
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

I miss this patch on next. As it fixes my problem. Is there any reason
why it is not applied?

Thanks,
Teresa

> ---
>  fs/tftp.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/tftp.c b/fs/tftp.c
> index 0d9ee6effd..8131ab27b3 100644
> --- a/fs/tftp.c
> +++ b/fs/tftp.c
> @@ -80,7 +80,7 @@ struct file_priv {
>  	int state;
>  	int err;
>  	char *filename;
> -	int filesize;
> +	loff_t filesize;
>  	uint64_t resend_timeout;
>  	uint64_t progress_timeout;
>  	struct kfifo *fifo;
> @@ -136,7 +136,7 @@ static int tftp_send(struct file_priv *priv)
>  				"timeout%c"
>  				"%d%c"
>  				"tsize%c"
> -				"%d%c"
> +				"%lld%c"
>  				"blksize%c"
>  				"1432",
>  				priv->filename + 1, 0,
> @@ -235,7 +235,7 @@ static void tftp_parse_oack(struct file_priv
> *priv, unsigned char *pkt, int len)
>  		if (val > s + len)
>  			return;
>  		if (!strcmp(opt, "tsize"))
> -			priv->filesize = simple_strtoul(val, NULL,
> 10);
> +			priv->filesize = simple_strtoull(val, NULL,
> 10);
>  		if (!strcmp(opt, "blksize"))
>  			priv->blocksize = simple_strtoul(val, NULL,
> 10);
>  		pr_debug("OACK opt: %s val: %s\n", opt, val);
> @@ -658,7 +658,7 @@ static struct dentry *tftp_lookup(struct inode
> *dir, struct dentry *dentry,
>  	struct fs_device_d *fsdev = container_of(sb, struct
> fs_device_d, sb);
>  	struct inode *inode;
>  	struct file_priv *priv;
> -	int filesize;
> +	loff_t filesize;
>  
>  	priv = tftp_do_open(&fsdev->dev, O_RDONLY, dentry);
>  	if (IS_ERR(priv))
> -- 
> 2.19.1
> 
> 

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox