Commit 9eaa67c6 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust

NFS: Clean-up: use correct type when converting NFS blocks to local blocks

inode->i_blocks is a blkcnt_t these days, which can be a u64 or unsigned
long, depending on the setting of CONFIG_LSF.
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 433c9237
...@@ -183,9 +183,9 @@ unsigned long nfs_block_bits(unsigned long bsize, unsigned char *nrbitsp) ...@@ -183,9 +183,9 @@ unsigned long nfs_block_bits(unsigned long bsize, unsigned char *nrbitsp)
/* /*
* Calculate the number of 512byte blocks used. * Calculate the number of 512byte blocks used.
*/ */
static inline unsigned long nfs_calc_block_size(u64 tsize) static inline blkcnt_t nfs_calc_block_size(u64 tsize)
{ {
loff_t used = (tsize + 511) >> 9; blkcnt_t used = (tsize + 511) >> 9;
return (used > ULONG_MAX) ? ULONG_MAX : used; return (used > ULONG_MAX) ? ULONG_MAX : used;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment