LU-9679 modules: convert MIN/MAX to kernel style

[fs/lustre-release.git] / lustre / mdd / mdd_object.c

diff --git a/lustre/mdd/mdd_object.c b/lustre/mdd/mdd_object.c
index 29af1ed..bfc4ae6 100644 (file)
--- a/lustre/mdd/mdd_object.c
+++ b/lustre/mdd/mdd_object.c
@@ -1218,8 +1218,9 @@ int mdd_attr_set(const struct lu_env *env, struct md_object *obj,
 
        /* no need to setattr anymore */
        if (la_copy->la_valid == 0) {
-               CDEBUG(D_INODE, "%s: no valid attribute on "DFID", previous"
-                      "valid is %#llx\n", mdd2obd_dev(mdd)->obd_name,
+               CDEBUG(D_INODE,
+                      "%s: no valid attribute on "DFID", previous valid is %#llx\n",
+                      mdd2obd_dev(mdd)->obd_name,
                       PFID(mdo2fid(mdd_obj)), la->la_valid);
 
                RETURN(0);
@@ -1442,7 +1443,8 @@ static int mdd_hsm_update_locked(const struct lu_env *env,
 
        /* Read HSM attrs from disk */
        current_buf = lu_buf_check_and_alloc(&info->mti_xattr_buf,
-                       MIN(mdd_obj2mdd_dev(mdd_obj)->mdd_dt_conf.ddp_max_ea_size,
+                       min_t(unsigned int,
+                             mdd_obj2mdd_dev(mdd_obj)->mdd_dt_conf.ddp_max_ea_size,
                            XATTR_SIZE_MAX));
        rc = mdo_xattr_get(env, mdd_obj, current_buf, XATTR_NAME_HSM);
        rc = lustre_buf2hsm(current_buf->lb_buf, rc, current_mh);