diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/hfsplus/wrapper.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 { | |||
24 | u16 embed_count; | 24 | u16 embed_count; |
25 | }; | 25 | }; |
26 | 26 | ||
27 | /* | 27 | /** |
28 | * hfsplus_submit_bio - Perfrom block I/O | 28 | * hfsplus_submit_bio - Perform block I/O |
29 | * @sb: super block of volume for I/O | 29 | * @sb: super block of volume for I/O |
30 | * @sector: block to read or write, for blocks of HFSPLUS_SECTOR_SIZE bytes | 30 | * @sector: block to read or write, for blocks of HFSPLUS_SECTOR_SIZE bytes |
31 | * @buf: buffer for I/O | 31 | * @buf: buffer for I/O |
@@ -234,7 +234,7 @@ reread: | |||
234 | sbi->alloc_blksz_shift = 0; | 234 | sbi->alloc_blksz_shift = 0; |
235 | while ((blocksize >>= 1) != 0) | 235 | while ((blocksize >>= 1) != 0) |
236 | sbi->alloc_blksz_shift++; | 236 | sbi->alloc_blksz_shift++; |
237 | blocksize = min(sbi->alloc_blksz, (u32)PAGE_SIZE); | 237 | blocksize = min_t(u32, sbi->alloc_blksz, PAGE_SIZE); |
238 | 238 | ||
239 | /* | 239 | /* |
240 | * Align block size to block offset. | 240 | * Align block size to block offset. |