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;
 	}