sector_t can be either 32-bit or 64-bit wide, but in the former
case, the NFS blocklayout code produces a couple of warnings:
blocklayout.c: In function 'bl_read_pagelist':
blocklayout.c:225:45: error: large integer implicitly truncated to unsigned
type [-Werror=overflow]
struct pnfs_block_dev_map map = { .start = NFS4_MAX_UINT64 };
^
blocklayout.c:282:16: error: large integer implicitly truncated to unsigned
type [-Werror=overflow]
map.start = NFS4_MAX_UINT64;
^
blocklayout.c: In function 'bl_write_pagelist':
blocklayout.c:368:45: error: large integer implicitly truncated to unsigned
type [-Werror=overflow]
struct pnfs_block_dev_map map = { .start = NFS4_MAX_UINT64 };
^
blocklayout.c: In function 'bl_free_layout_hdr':
blocklayout.c:443:37: error: large integer implicitly truncated to unsigned
type [-Werror=overflow]
err = ext_tree_remove(bl, true, 0, LLONG_MAX);
^
blocklayout.c: In function 'bl_return_range':
blocklayout.c:708:9: error: large integer implicitly truncated to unsigned type
[-Werror=overflow]
end = round_down(NFS4_MAX_UINT64, PAGE_SIZE);
In all instances, NFS4_MAX_UINT64 is meant to just refer to the largest
representable unsigned integer, and the warning is for the implicit
type conversiont to a smaller type. As the conversion is ok, we
can use an explict cast to stop the warning.
Signed-off-by: Arnd Bergmann <a...@arndb.de>
---
fs/nfs/blocklayout/blocklayout.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
index ddd0138f410c..94b2f9e272c5 100644
--- a/fs/nfs/blocklayout/blocklayout.c
+++ b/fs/nfs/blocklayout/blocklayout.c
@@ -222,7 +222,7 @@ static enum pnfs_try_status
bl_read_pagelist(struct nfs_pgio_header *header)
{
struct pnfs_block_layout *bl = BLK_LSEG2EXT(header->lseg);
- struct pnfs_block_dev_map map = { .start = NFS4_MAX_UINT64 };
+ struct pnfs_block_dev_map map = { .start = (sector_t)NFS4_MAX_UINT64 };
struct bio *bio = NULL;
struct pnfs_block_extent be;
sector_t isect, extent_length = 0;
@@ -279,7 +279,7 @@ bl_read_pagelist(struct nfs_pgio_header *header)
zero_user_segment(pages[i], pg_offset, pg_len);
/* invalidate map */
- map.start = NFS4_MAX_UINT64;
+ map.start = (sector_t)NFS4_MAX_UINT64;
} else {
bio = do_add_page_to_bio(bio,
header->page_array.npages - i,
@@ -365,7 +365,7 @@ static enum pnfs_try_status
bl_write_pagelist(struct nfs_pgio_header *header, int sync)
{
struct pnfs_block_layout *bl = BLK_LSEG2EXT(header->lseg);
- struct pnfs_block_dev_map map = { .start = NFS4_MAX_UINT64 };
+ struct pnfs_block_dev_map map = { .start = (sector_t)NFS4_MAX_UINT64 };
struct bio *bio = NULL;
struct pnfs_block_extent be;
sector_t isect, extent_length = 0;
@@ -440,7 +440,7 @@ static void bl_free_layout_hdr(struct pnfs_layout_hdr *lo)
dprintk("%s enter\n", __func__);
- err = ext_tree_remove(bl, true, 0, LLONG_MAX);
+ err = ext_tree_remove(bl, true, 0, (sector_t)LLONG_MAX);
WARN_ON(err);
kfree(bl);
@@ -705,7 +705,7 @@ bl_return_range(struct pnfs_layout_hdr *lo,
end = offset + (range->length >> SECTOR_SHIFT);
} else {
- end = round_down(NFS4_MAX_UINT64, PAGE_SIZE);
+ end = round_down((sector_t)NFS4_MAX_UINT64, PAGE_SIZE);
}
ext_tree_remove(bl, range->iomode & IOMODE_RW, offset, end);
--
2.7.0
