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

[fs/lustre-release.git] / lustre / osd-zfs / osd_internal.h

diff --git a/lustre/osd-zfs/osd_internal.h b/lustre/osd-zfs/osd_internal.h
index c860762..dde36de 100644 (file)
--- a/lustre/osd-zfs/osd_internal.h
+++ b/lustre/osd-zfs/osd_internal.h
@@ -474,7 +474,8 @@ extern struct lu_device_operations  osd_lu_ops;
 extern struct dt_index_operations osd_dir_ops;
 int osd_declare_quota(const struct lu_env *env, struct osd_device *osd,
                      qid_t uid, qid_t gid, qid_t projid, long long space,
-                     struct osd_thandle *oh, int *flags,
+                     struct osd_thandle *oh,
+                     enum osd_quota_local_flags *local_flags,
                      enum osd_qid_declare_flags osd_qid_declare_flags);
 uint64_t osd_objs_count_estimate(uint64_t refdbytes, uint64_t usedobjs,
                                 uint64_t nrblocks, uint64_t est_maxblockshift);
@@ -855,7 +856,8 @@ osd_dmu_object_alloc(objset_t *os, dmu_object_type_t objtype, int blocksize,
                     int dnodesize, dmu_tx_t *tx)
 {
        if (dnodesize == 0)
-               dnodesize = MAX(dmu_objset_dnodesize(os), DNODE_MIN_SIZE);
+               dnodesize = max_t(int, dmu_objset_dnodesize(os),
+                                 DNODE_MIN_SIZE);
 
        return dmu_object_alloc_dnsize(os, objtype, blocksize, DMU_OT_SA,
                                       DN_BONUS_SIZE(dnodesize), dnodesize, tx);
@@ -867,7 +869,8 @@ osd_zap_create_flags(objset_t *os, int normflags, zap_flags_t flags,
                     int indirect_blockshift, int dnodesize, dmu_tx_t *tx)
 {
        if (dnodesize == 0)
-               dnodesize = MAX(dmu_objset_dnodesize(os), DNODE_MIN_SIZE);
+               dnodesize = max_t(int, dmu_objset_dnodesize(os),
+                                 DNODE_MIN_SIZE);
 
        return zap_create_flags_dnsize(os, normflags, flags, ot,
                                       leaf_blockshift, indirect_blockshift,