From d5e8fd9d018f67f73074084493d68fdac49916ae Mon Sep 17 00:00:00 2001
From: Steve French <stevef@smf-gateway.(none)>
Date: Fri, 23 Mar 2012 16:30:56 -0500
Subject: [PATCH] --- yaml --- r: 297983 b: refs/heads/master c:
 c7ad42b52d866b238ebb311d32ac80338f5c39d4 h: refs/heads/master i:   297981:
 25d13739483a552bb9a576efada6996a1e0338ce   297979:
 88e1889c8ac998f04ce17a2fe996aa4d9b2762d9   297975:
 5e697b54d9670b30bca6f713301b5f832cb96f6b   297967:
 5856f9cbe85b340fad4746c47b0db8687f8be3c4   297951:
 81df5cf94aa08afdefaf7827d562c3e94a906709   297919:
 748550e2871418c95ccb9bccbb5f9c174b2d21e0   297855:
 8d5c187d4b6eb3afdfb99e7d82cb48ffbeee408e   297727:
 0ae27b2cc9d1462b9efd65358abcdc884c96833a   297471:
 f7adfc76a702536e3b1394682db1ed1e897adb50   296959:
 615aba3617f3ca78937aac37009de45ee6319e42 v: v3

---
 [refs]               | 2 +-
 trunk/fs/cifs/file.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bfe1e43a2cb5..beba9f95a654 100644
--- 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
index daaaca82eeb2..460d87b7cda0 100644
--- 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;
 	}