From fc833fca36ef799700faa451b316bb9552ccee99 Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Fri, 26 Oct 2007 13:31:20 -0400
Subject: [PATCH] --- yaml --- r: 82406 b: refs/heads/master c:
 01b2969a8528b926f5e4d98161ae37053234475c h: refs/heads/master v: v3

---
 [refs]                   |  2 +-
 trunk/net/sunrpc/cache.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 9f842d523174..d608108b0407 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4395e03fec0895d01451904b8a2276ceda663c9
+refs/heads/master: 01b2969a8528b926f5e4d98161ae37053234475c
diff --git a/trunk/net/sunrpc/cache.c b/trunk/net/sunrpc/cache.c
index 73f053d0cc7a..d27bbe0ee907 100644
--- a/trunk/net/sunrpc/cache.c
+++ b/trunk/net/sunrpc/cache.c
@@ -1244,18 +1244,18 @@ static ssize_t read_flush(struct file *file, char __user *buf,
 	struct cache_detail *cd = PDE(file->f_path.dentry->d_inode)->data;
 	char tbuf[20];
 	unsigned long p = *ppos;
-	int len;
+	size_t len;
 
 	sprintf(tbuf, "%lu\n", cd->flush_time);
 	len = strlen(tbuf);
 	if (p >= len)
 		return 0;
 	len -= p;
-	if (len > count) len = count;
+	if (len > count)
+		len = count;
 	if (copy_to_user(buf, (void*)(tbuf+p), len))
-		len = -EFAULT;
-	else
-		*ppos += len;
+		return -EFAULT;
+	*ppos += len;
 	return len;
 }