Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
LU-9679 modules: convert MIN/MAX to kernel style
[fs/lustre-release.git]
/
lustre
/
lod
/
lod_object.c
diff --git
a/lustre/lod/lod_object.c
b/lustre/lod/lod_object.c
index
0d6b06a
..
e11f474
100644
(file)
--- a/
lustre/lod/lod_object.c
+++ b/
lustre/lod/lod_object.c
@@
-3454,7
+3454,7
@@
static int lod_declare_layout_merge(const struct lu_env *env,
lcme->lcme_id = cpu_to_le32(id);
}
- id =
MAX
(le32_to_cpu(lcme->lcme_id), id);
+ id =
max
(le32_to_cpu(lcme->lcme_id), id);
}
mirror_id = mirror_id_of(id) + 1;