Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[deliverable/linux.git] / fs / nilfs2 / alloc.c

diff --git a/fs/nilfs2/alloc.c b/fs/nilfs2/alloc.c
index bdd5ac522904aa32677c40360f7f5c6743b45fe3..1a85d94f5b25f161fdcdef907d506d1c157a78bd 100644 (file)
--- a/fs/nilfs2/alloc.c
+++ b/fs/nilfs2/alloc.c
@@ -53,7 +53,7 @@ nilfs_palloc_groups_count(const struct inode *inode)
  * @inode: inode of metadata file using this allocator
  * @entry_size: size of the persistent object
  */
-int nilfs_palloc_init_blockgroup(struct inode *inode, unsigned entry_size)
+int nilfs_palloc_init_blockgroup(struct inode *inode, unsigned int entry_size)
 {
        struct nilfs_mdt_info *mi = NILFS_MDT(inode);
 
@@ -68,13 +68,17 @@ int nilfs_palloc_init_blockgroup(struct inode *inode, unsigned entry_size)
        mi->mi_blocks_per_group =
                DIV_ROUND_UP(nilfs_palloc_entries_per_group(inode),
                             mi->mi_entries_per_block) + 1;
-               /* Number of blocks in a group including entry blocks and
-                  a bitmap block */
+               /*
+                * Number of blocks in a group including entry blocks
+                * and a bitmap block
+                */
        mi->mi_blocks_per_desc_block =
                nilfs_palloc_groups_per_desc_block(inode) *
                mi->mi_blocks_per_group + 1;
-               /* Number of blocks per descriptor including the
-                  descriptor block */
+               /*
+                * Number of blocks per descriptor including the
+                * descriptor block
+                */
        return 0;
 }
 
@@ -384,7 +388,7 @@ void *nilfs_palloc_block_get_entry(const struct inode *inode, __u64 nr,
  */
 static int nilfs_palloc_find_available_slot(unsigned char *bitmap,
                                            unsigned long target,
-                                           unsigned bsize,
+                                           unsigned int bsize,
                                            spinlock_t *lock)
 {
        int pos, end = bsize;
@@ -735,8 +739,8 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems)
        unsigned long group, group_offset;
        __u64 group_min_nr, last_nrs[8];
        const unsigned long epg = nilfs_palloc_entries_per_group(inode);
-       const unsigned epb = NILFS_MDT(inode)->mi_entries_per_block;
-       unsigned entry_start, end, pos;
+       const unsigned int epb = NILFS_MDT(inode)->mi_entries_per_block;
+       unsigned int entry_start, end, pos;
        spinlock_t *lock;
        int i, j, k, ret;
        u32 nfree;