Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[firefly-linux-kernel-4.4.55.git] / fs / nilfs2 / alloc.c

diff --git a/fs/nilfs2/alloc.c b/fs/nilfs2/alloc.c
index 741fd02e04447fbcc44f2ad3733a1f509cba4c48..8df0f3b7839b5ee979ee48d63323dde21b637ce2 100644 (file)
--- a/fs/nilfs2/alloc.c
+++ b/fs/nilfs2/alloc.c
@@ -405,13 +405,14 @@ nilfs_palloc_rest_groups_in_desc_block(const struct inode *inode,
 static int nilfs_palloc_count_desc_blocks(struct inode *inode,
                                            unsigned long *desc_blocks)
 {
-       unsigned long blknum;
+       __u64 blknum;
        int ret;
 
        ret = nilfs_bmap_last_key(NILFS_I(inode)->i_bmap, &blknum);
        if (likely(!ret))
                *desc_blocks = DIV_ROUND_UP(
-                       blknum, NILFS_MDT(inode)->mi_blocks_per_desc_block);
+                       (unsigned long)blknum,
+                       NILFS_MDT(inode)->mi_blocks_per_desc_block);
        return ret;
 }