Skip to content

Commit

Permalink
nfsd: Fix NFSD_MDS_PR_KEY on 32-bit by adding ULL postfix
Browse files Browse the repository at this point in the history
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: f99d4fb ("nfsd: add SCSI layout support")
Signed-off-by: Geert Uytterhoeven <[email protected]>
Reviewed-by: Christoph Hellwig <[email protected]>
Signed-off-by: J. Bruce Fields <[email protected]>
  • Loading branch information
geertu authored and J. Bruce Fields committed Jun 14, 2016
1 parent 5edb564 commit eee9301
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/nfsd/blocklayout.c
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ static int nfsd4_scsi_identify_device(struct block_device *bdev,
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.
Expand Down

0 comments on commit eee9301

Please sign in to comment.