summaryrefslogtreecommitdiffstats
path: root/fs/nfs/internal.h
diff options
context:
space:
mode:
authorChuck Lever2007-07-01 18:12:19 +0200
committerTrond Myklebust2007-07-11 05:40:44 +0200
commit9eaa67c6a5b77f248c4703d81c4a6c6434e35385 (patch)
treeacc90ec1e457b8583f8a9eafc6142152d8b41228 /fs/nfs/internal.h
parentNFS: Clean up nfs_size_to_loff_t() (diff)
downloadkernel-qcow2-linux-9eaa67c6a5b77f248c4703d81c4a6c6434e35385.tar.gz
kernel-qcow2-linux-9eaa67c6a5b77f248c4703d81c4a6c6434e35385.tar.xz
kernel-qcow2-linux-9eaa67c6a5b77f248c4703d81c4a6c6434e35385.zip
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: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/internal.h')
-rw-r--r--fs/nfs/internal.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index ad2b40db1e65..76cf55d57101 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -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;
}