Skip to content

Commit 87327d4

Browse files
andy-shevidryomov
authored andcommitted
ceph: Amend checking to fix make W=1 build breakage
In a few cases the code compares 32-bit value to a SIZE_MAX derived constant which is much higher than that value on 64-bit platforms, Clang, in particular, is not happy about this fs/ceph/snap.c:377:10: error: result of comparison of constant 2305843009213693948 with expression of type 'u32' (aka 'unsigned int') is always false [-Werror,-Wtautological-constant-out-of-range-compare] 377 | if (num > (SIZE_MAX - sizeof(*snapc)) / sizeof(u64)) | ~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fix this by casting to size_t. Note, that possible replacement of SIZE_MAX by U32_MAX may lead to the behaviour changes on the corner cases. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Viacheslav Dubeyko <Slava.Dubeyko@ibm.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
1 parent d927a59 commit 87327d4

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

fs/ceph/snap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ static int build_snap_context(struct ceph_mds_client *mdsc,
374374

375375
/* alloc new snap context */
376376
err = -ENOMEM;
377-
if (num > (SIZE_MAX - sizeof(*snapc)) / sizeof(u64))
377+
if ((size_t)num > (SIZE_MAX - sizeof(*snapc)) / sizeof(u64))
378378
goto fail;
379379
snapc = ceph_create_snap_context(num, GFP_NOFS);
380380
if (!snapc)

0 commit comments

Comments
 (0)