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

[fs/lustre-release.git] / lustre / mdc / mdc_locks.c

diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index 7bceb53..574d09b 100644 (file)
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -743,6 +743,12 @@ static int mdc_finish_enqueue(struct obd_export *exp,
                        mdc_set_open_replay_data(NULL, NULL, it);
                }
 
+               if (it_disposition(it, DISP_OPEN_CREATE) &&
+                   !it_open_error(DISP_OPEN_CREATE, it)) {
+                       lprocfs_counter_incr(exp->exp_obd->obd_md_stats,
+                                            LPROC_MD_CREATE);
+               }
+
                if (body->mbo_valid & (OBD_MD_FLDIREA | OBD_MD_FLEASIZE)) {
                         void *eadata;
 
@@ -920,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;
 
@@ -1033,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;
        }