---

yaml --- r: 297983 b: refs/heads/master c: c7ad42b h: refs/heads/master i: 297981: 25d1373 297979: 88e1889 297975: 5e697b5 297967: 5856f9c 297951: 81df5cf 297919: 748550e 297855: 8d5c187 297727: 0ae27b2 297471: f7adfc7 296959: 615aba3 v: v3
git-mirror · Mar 23, 2012 · d5e8fd9 · d5e8fd9
1 parent 6b8ca52
commit d5e8fd9
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: d81625587f4fac44a4367c468ba2fe2d981460f8
+refs/heads/master: c7ad42b52d866b238ebb311d32ac80338f5c39d4
diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c
@@ -2114,7 +2114,7 @@ cifs_uncached_marshal_iov(struct kvec *iov, struct cifs_writedata *wdata)
 
 	/* marshal up the pages into iov array */
 	for (i = 0; i < wdata->nr_pages; i++) {
-		iov[i + 1].iov_len = min(bytes, PAGE_SIZE);
+		iov[i + 1].iov_len = min_t(size_t, bytes, PAGE_SIZE);
 		iov[i + 1].iov_base = kmap(wdata->pages[i]);
 		bytes -= iov[i + 1].iov_len;
 	}