X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_permission.c;h=08578896ae87af5b805c32186a7e9d6e2b3459d8;hp=2b03de13b713c3f6743d2d900bc9c1ce59e7b4a9;hb=4c4c327b25f3414f20a9ae600e7311f1aa3a866d;hpb=117f587bc3e60f4dd1c939f8488e43cb752c12ca;ds=sidebyside

diff --git a/lustre/mdd/mdd_permission.c b/lustre/mdd/mdd_permission.c
index 2b03de1..0857889 100644
--- a/lustre/mdd/mdd_permission.c
+++ b/lustre/mdd/mdd_permission.c
@@ -62,8 +62,9 @@ int mdd_acl_chmod(const struct lu_env *env, struct mdd_object *o, __u32 mode,
 	ENTRY;
 
 	lu_buf_check_and_alloc(&mdd_env_info(env)->mti_xattr_buf,
-			MIN(mdd_obj2mdd_dev(o)->mdd_dt_conf.ddp_max_ea_size,
-			    XATTR_SIZE_MAX));
+			min_t(unsigned int,
+			      mdd_obj2mdd_dev(o)->mdd_dt_conf.ddp_max_ea_size,
+			      XATTR_SIZE_MAX));
 	buf = mdd_env_info(env)->mti_xattr_buf;
 	if (buf.lb_buf == NULL)
 		RETURN(-ENOMEM);
@@ -217,8 +218,9 @@ static int mdd_check_acl(const struct lu_env *env, struct mdd_object *obj,
 	ENTRY;
 
 	lu_buf_check_and_alloc(&mdd_env_info(env)->mti_xattr_buf,
-			MIN(mdd_obj2mdd_dev(obj)->mdd_dt_conf.ddp_max_ea_size,
-			    XATTR_SIZE_MAX));
+			min_t(unsigned int,
+			      mdd_obj2mdd_dev(obj)->mdd_dt_conf.ddp_max_ea_size,
+			      XATTR_SIZE_MAX));
 	buf = mdd_env_info(env)->mti_xattr_buf;
 	if (buf.lb_buf == NULL)
 		RETURN(-ENOMEM);