diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-09-18 13:28:06 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-09-24 18:30:29 -0400 |
| commit | c79cba37b3b42cf8fbd71babcd8998867f76fead (patch) | |
| tree | 52e446aa0b8c3a623715da84b0fc9bdbd4826c0d /fs/zfs/zfs.c | |
| parent | 87f13aa00d0279fcc96530404c3a104eb4cb1672 (diff) | |
| download | talos-obmc-uboot-c79cba37b3b42cf8fbd71babcd8998867f76fead.tar.gz talos-obmc-uboot-c79cba37b3b42cf8fbd71babcd8998867f76fead.zip | |
cosmetic: replace MIN, MAX with min, max
The macro MIN, MAX is defined as the aliase of min, max,
respectively.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'fs/zfs/zfs.c')
| -rw-r--r-- | fs/zfs/zfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/zfs/zfs.c b/fs/zfs/zfs.c index 099d51718b..818d3d926d 100644 --- a/fs/zfs/zfs.c +++ b/fs/zfs/zfs.c @@ -772,7 +772,7 @@ zap_leaf_array_equal(zap_leaf_phys_t *l, zfs_endian_t endian, while (bseen < array_len) { struct zap_leaf_array *la = &ZAP_LEAF_CHUNK(l, blksft, chunk).l_array; - int toread = MIN(array_len - bseen, ZAP_LEAF_ARRAY_BYTES); + int toread = min(array_len - bseen, ZAP_LEAF_ARRAY_BYTES); if (chunk >= ZAP_LEAF_NUMCHUNKS(blksft)) return 0; @@ -794,7 +794,7 @@ zap_leaf_array_get(zap_leaf_phys_t *l, zfs_endian_t endian, int blksft, while (bseen < array_len) { struct zap_leaf_array *la = &ZAP_LEAF_CHUNK(l, blksft, chunk).l_array; - int toread = MIN(array_len - bseen, ZAP_LEAF_ARRAY_BYTES); + int toread = min(array_len - bseen, ZAP_LEAF_ARRAY_BYTES); if (chunk >= ZAP_LEAF_NUMCHUNKS(blksft)) /* Don't use errno because this error is to be ignored. */ @@ -2118,7 +2118,7 @@ zfs_read(zfs_file_t file, char *buf, uint64_t len) data->file_start = blkid * blksz; data->file_end = data->file_start + blksz; - movesize = MIN(length, data->file_end - (int) file->offset - red); + movesize = min(length, data->file_end - (int)file->offset - red); memmove(buf, data->file_buf + file->offset + red - data->file_start, movesize); |
