summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2013-08-08 12:57:10 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2013-08-08 12:57:10 +1000
commit085f415b0915ce4dc82db3672251ce0235bdf5f4 (patch)
tree17b245cdd4479c1488577ad1210da2e86643b3c7 /fs
parentcf2e56e3248da7ed95d8a04c27409a3391ab7f9c (diff)
fat-additions-to-support-fat_fallocate-fix
fix min() warning Cc: Amit Sahrawat <a.sahrawat@samsung.com> Cc: Namjae Jeon <namjae.jeon@samsung.com> Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Cc: Ravishankar N <ravi.n1@samsung.com> Reported-by: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/fat/inode.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 5adc09fba413..fc6b37d66533 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -162,7 +162,8 @@ static int fat_zero_falloc_area(struct file *file,
int err;
do {
- unsigned offset, bytes;
+ unsigned offset;
+ size_t bytes;
void *fsdata;
offset = (curpos & (PAGE_CACHE_SIZE - 1));