From: Fabian Frederick Date: Fri, 6 Jun 2014 21:36:27 +0000 (-0700) Subject: fs/hfsplus/wrapper.c: replace min/casting by min_t X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=915ab236d3c491f9bb0f6596d03e25b37f4d5a20;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git fs/hfsplus/wrapper.c: replace min/casting by min_t Also add * before function comments (it was not detected by kernel-doc) Signed-off-by: Fabian Frederick Cc: Vyacheslav Dubeyko Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/fs/hfsplus/wrapper.c b/fs/hfsplus/wrapper.c index 3f999649587f..284c90f943a1 100644 --- a/fs/hfsplus/wrapper.c +++ b/fs/hfsplus/wrapper.c @@ -24,8 +24,8 @@ struct hfsplus_wd { u16 embed_count; }; -/* - * hfsplus_submit_bio - Perfrom block I/O +/** + * hfsplus_submit_bio - Perform block I/O * @sb: super block of volume for I/O * @sector: block to read or write, for blocks of HFSPLUS_SECTOR_SIZE bytes * @buf: buffer for I/O @@ -234,7 +234,7 @@ reread: sbi->alloc_blksz_shift = 0; while ((blocksize >>= 1) != 0) sbi->alloc_blksz_shift++; - blocksize = min(sbi->alloc_blksz, (u32)PAGE_SIZE); + blocksize = min_t(u32, sbi->alloc_blksz, PAGE_SIZE); /* * Align block size to block offset.