VisionFive2 Linux kernel

author: Fabian Frederick <fabf@skynet.be> 2014-06-06 14:36:27 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2014-06-06 16:08:10 -0700 commit: 915ab236d3c491f9bb0f6596d03e25b37f4d5a20 parent: d8983ca0aa86c0bfed13f5232340fe08fe963121

Commit Summary:

fs/hfsplus/wrapper.c: replace min/casting by min_t

Diffstat:

1 file 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 {
 	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.