Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

fs/nfs/internal.h

+2 −2
Original line number Diff line number Diff line
@@ -183,9 +183,9 @@ unsigned long nfs_block_bits(unsigned long bsize, unsigned char *nrbitsp) 
/*

 * 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;

}