2016-03-25 10:47:15

by Geert Uytterhoeven

Subject: [PATCH] nfds: Fix NFSD_MDS_PR_KEY on 32-bit by adding ULL postfix

On 32-bit:

fs/nfsd/blocklayout.c: In function ‘nfsd4_block_get_device_info_scsi’:
fs/nfsd/blocklayout.c:337: warning: integer constant is too large for ‘long’ type
fs/nfsd/blocklayout.c:344: warning: integer constant is too large for ‘long’ type
fs/nfsd/blocklayout.c: In function ‘nfsd4_scsi_fence_client’:
fs/nfsd/blocklayout.c:385: warning: integer constant is too large for ‘long’ type

Add the missing "ULL" postfix to 64-bit constant NFSD_MDS_PR_KEY to fix
this.

Fixes: f99d4fbdae6765d0 ("nfsd: add SCSI layout support")
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
fs/nfsd/blocklayout.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c
index e55b5242614da7a9..31f3df193bdbb47b 100644
--- a/fs/nfsd/blocklayout.c
+++ b/fs/nfsd/blocklayout.c
@@ -290,7 +290,7 @@ out_free_buf:
return error;
}

-#define NFSD_MDS_PR_KEY 0x0100000000000000
+#define NFSD_MDS_PR_KEY 0x0100000000000000ULL

/*
* We use the client ID as a unique key for the reservations.
--
1.9.1

2016-03-25 18:04:24

by Christoph Hellwig

Subject: Re: [PATCH] nfds: Fix NFSD_MDS_PR_KEY on 32-bit by adding ULL postfix

Looks fine, thanks!

Reviewed-by: Christoph Hellwig <[email protected]>

2016-03-25 18:34:45

by Joe Perches

Subject: Re: [PATCH] nfds: Fix NFSD_MDS_PR_KEY on 32-bit by adding ULL postfix

On Fri, 2016-03-25 at 19:04 +0100, Christoph Hellwig wrote:
> Reviewed-by: Christoph Hellwig <[email protected]>

Outside of the known 64 bit only uses,
this shows a few oddities too:

$ git grep -P -w -i '0x[0-9a-f]{9,16}(?!ull|ll)'

2016-03-28 23:48:28

by J. Bruce Fields

Subject: Re: [PATCH] nfds: Fix NFSD_MDS_PR_KEY on 32-bit by adding ULL postfix

On Fri, Mar 25, 2016 at 07:04:22PM +0100, Christoph Hellwig wrote:
> Looks fine, thanks!
>
> Reviewed-by: Christoph Hellwig <[email protected]>

Thanks, applying for 4.6.--b.