---

yaml --- r: 359747 b: refs/heads/master c: 56edc86 h: refs/heads/master i: 359745: 91bc50c 359743: feda942 v: v3
git-mirror · Feb 17, 2013 · 5024aed · 5024aed
1 parent 26a0864
commit 5024aed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc630d9f476445927fca599f81182c7f06f79058
+refs/heads/master: 56edc86b5a72bdbc86358e57fb09165136baf0b8
diff --git a/trunk/fs/nfsd/nfscache.c b/trunk/fs/nfsd/nfscache.c
@@ -263,7 +263,7 @@ nfsd_cache_csum(struct svc_rqst *rqstp)
 	base = buf->page_base & ~PAGE_MASK;
 	while (csum_len) {
 		p = page_address(buf->pages[idx]) + base;
-		len = min(PAGE_SIZE - base, csum_len);
+		len = min_t(size_t, PAGE_SIZE - base, csum_len);
 		csum = csum_partial(p, len, csum);
 		csum_len -= len;
 		base = 0;