lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Chuck Lever
2007-07-01 12:12:19 -04:00
committed by Trond Myklebust
parent 433c92379d
commit 9eaa67c6a5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfs/internal.h
View File

@@ -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;
} }