From 361d5bd7730befeaea63c53dd3d22fac6914a966 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Fri, 7 Sep 2012 09:41:30 +0200 Subject: fs/nfs: fix read when size < 1024 Currently we always request 1024. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Sascha Hauer --- fs/nfs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/nfs.c b/fs/nfs.c index 4a880cd302..797e3bd471 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; -- cgit v1.2.3