X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdc%2Fmdc_locks.c;h=574d09b6fc70a0ce5185cad213f32c5b4360ea9f;hp=81bfebc720241c6620c399f84f150ced7be8ed2b;hb=4c4c327b25f3414f20a9ae600e7311f1aa3a866d;hpb=117f587bc3e60f4dd1c939f8488e43cb752c12ca

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index 81bfebc..574d09b 100644
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -926,8 +926,8 @@ static int mdc_enqueue_base(struct obd_export *exp,
 
 	generation = obddev->u.cli.cl_import->imp_generation;
 	if (!it || (it->it_op & (IT_OPEN | IT_CREAT)))
-		acl_bufsize = MIN(imp->imp_connect_data.ocd_max_easize,
-				  XATTR_SIZE_MAX);
+		acl_bufsize = min_t(__u32, imp->imp_connect_data.ocd_max_easize,
+				    XATTR_SIZE_MAX);
 	else
 		acl_bufsize = LUSTRE_POSIX_ACL_MAX_SIZE_OLD;
 
@@ -1039,8 +1039,8 @@ resend:
 	    acl_bufsize == LUSTRE_POSIX_ACL_MAX_SIZE_OLD) {
 		mdc_clear_replay_flag(req, -ERANGE);
 		ptlrpc_req_finished(req);
-		acl_bufsize = MIN(imp->imp_connect_data.ocd_max_easize,
-				  XATTR_SIZE_MAX);
+		acl_bufsize = min_t(__u32, imp->imp_connect_data.ocd_max_easize,
+				    XATTR_SIZE_MAX);
 		goto resend;
 	}