Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fs/jfs/jfs_dmap.c: replace min/casting by min_t

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Cc: Andrew Morton <akpm@linux-foundation.org>

authored by

Fabian Frederick and committed by
Dave Kleikamp
4f65b6db 789602e9

+5 -4
+5 -4
fs/jfs/jfs_dmap.c
··· 1208 1208 * by this leaf. 1209 1209 */ 1210 1210 l2size = 1211 - min((int)leaf[word], NLSTOL2BSZ(nwords)); 1211 + min_t(int, leaf[word], NLSTOL2BSZ(nwords)); 1212 1212 1213 1213 /* determine how many words were handled. 1214 1214 */ ··· 1902 1902 1903 1903 /* determine how many blocks to allocate from this dmap. 1904 1904 */ 1905 - nb = min(n, (s64)BPERDMAP); 1905 + nb = min_t(s64, n, BPERDMAP); 1906 1906 1907 1907 /* allocate the blocks from the dmap. 1908 1908 */ ··· 2260 2260 * of bits being allocated and the l2 number 2261 2261 * of bits currently described by this leaf. 2262 2262 */ 2263 - size = min((int)leaf[word], NLSTOL2BSZ(nwords)); 2263 + size = min_t(int, leaf[word], 2264 + NLSTOL2BSZ(nwords)); 2264 2265 2265 2266 /* update the leaf to reflect the allocation. 2266 2267 * in addition to setting the leaf value to ··· 3564 3563 if (mp == NULL) 3565 3564 goto errout; 3566 3565 3567 - n = min(nblocks, (s64)BPERDMAP); 3566 + n = min_t(s64, nblocks, BPERDMAP); 3568 3567 } 3569 3568 3570 3569 dp = (struct dmap *) mp->data;