diff --git a/[refs] b/[refs]
index 69ac68ff5ebd..3f14389a0fc3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a641dc2a5a1445eb4cb491080dfc41c42a9eb37d
+refs/heads/master: dad7d975e4bd893c79fd122105b37b9a1776816a
diff --git a/trunk/fs/ocfs2/quota_global.c b/trunk/fs/ocfs2/quota_global.c
index 444aa5a467fb..6aff8f2d3e49 100644
--- a/trunk/fs/ocfs2/quota_global.c
+++ b/trunk/fs/ocfs2/quota_global.c
@@ -167,7 +167,7 @@ ssize_t ocfs2_quota_read(struct super_block *sb, int type, char *data,
 		len = i_size - off;
 	toread = len;
 	while (toread > 0) {
-		tocopy = min((size_t)(sb->s_blocksize - offset), toread);
+		tocopy = min_t(size_t, (sb->s_blocksize - offset), toread);
 		bh = NULL;
 		err = ocfs2_read_quota_block(gqinode, blk, &bh);
 		if (err) {