[PATCH 1/1] fs/nfs: fix read when size < 1024

[PATCH 1/1] fs/nfs: fix read when size < 1024

[Jean-Christophe PLAGNIOL-VILLARD]

Currently we always request 1024.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 fs/nfs.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fs/nfs.c b/fs/nfs.c
index 4a880cd..797e3bd 100644
--- a/fs/nfs.c
+++ b/fs/nfs.c
@@ -819,7 +819,11 @@ static int nfs_read(struct device_d *dev, FILE *file, void *buf, size_t insize)
 		insize -= now;
 
 		if (insize) {
-			now = 1024;
+			/* do not use min as insize is a size_t */
+			if (insize < 1024)
+				now = insize;
+			else
+				now = 1024;
 
 			if (pos + now > file->size)
 				now = file->size - pos;
-- 
1.7.10.4


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

Re: [PATCH 1/1] fs/nfs: fix read when size < 1024

[Sascha Hauer]

On Fri, Sep 07, 2012 at 09:41:30AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> Currently we always request 1024.
> 
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Applied, thanks

Sascha

> ---
>  fs/nfs.c |    6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/nfs.c b/fs/nfs.c
> index 4a880cd..797e3bd 100644
> --- a/fs/nfs.c
> +++ b/fs/nfs.c
> @@ -819,7 +819,11 @@ static int nfs_read(struct device_d *dev, FILE *file, void *buf, size_t insize)
>  		insize -= now;
>  
>  		if (insize) {
> -			now = 1024;
> +			/* do not use min as insize is a size_t */
> +			if (insize < 1024)
> +				now = insize;
> +			else
> +				now = 1024;
>  
>  			if (pos + now > file->size)
>  				now = file->size - pos;
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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