Skip to content

Commit b29a7a8

Browse files
arndbtorvalds
authored andcommitted
fs: fuse: fix max() of incompatible types
The 'max()' value of a 'long long' and an 'unsigned int' is problematic if the former is negative: In function 'fuse_wr_pages', inlined from 'fuse_perform_write' at fs/fuse/file.c:1347:27: include/linux/compiler_types.h:652:45: error: call to '__compiletime_assert_390' declared with attribute error: min(((pos + len - 1) >> 12) - (pos >> 12) + 1, max_pages) signedness error 652 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^ Use a temporary variable to make it clearer what is going on here. Fixes: 0f5bb0c ("fs: use min() or umin() instead of min_t()") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 9e35511 commit b29a7a8

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

fs/fuse/file.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1323,8 +1323,10 @@ static ssize_t fuse_fill_write_pages(struct fuse_io_args *ia,
13231323
static inline unsigned int fuse_wr_pages(loff_t pos, size_t len,
13241324
unsigned int max_pages)
13251325
{
1326-
return min(((pos + len - 1) >> PAGE_SHIFT) - (pos >> PAGE_SHIFT) + 1,
1327-
max_pages);
1326+
unsigned int pages = ((pos + len - 1) >> PAGE_SHIFT) -
1327+
(pos >> PAGE_SHIFT) + 1;
1328+
1329+
return min(pages, max_pages);
13281330
}
13291331

13301332
static ssize_t fuse_perform_write(struct kiocb *iocb, struct iov_iter *ii)

0 commit comments

Comments
 (0)