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

Commit 0c6c44cb authored by Ryusuke Konishi's avatar Ryusuke Konishi Committed by Linus Torvalds
Browse files

nilfs2: avoid bare use of 'unsigned' 

This fixes checkpatch.pl warning "WARNING: Prefer 'unsigned int' to
bare use of 'unsigned'".

Link: http://lkml.kernel.org/r/1462886671-3521-5-git-send-email-konishi.ryusuke@lab.ntt.co.jp


Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7592ecde

fs/nilfs2/alloc.c

+4 −4
Original line number Diff line number Diff line
@@ -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);
@@ -384,7 +384,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 +735,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;

fs/nilfs2/alloc.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ nilfs_palloc_entries_per_group(const struct inode *inode) 
	return 1UL << (inode->i_blkbits + 3 /* log2(8 = CHAR_BITS) */);

}



int nilfs_palloc_init_blockgroup(struct inode *, unsigned);

int nilfs_palloc_init_blockgroup(struct inode *, unsigned int);

int nilfs_palloc_get_entry_block(struct inode *, __u64, int,

				 struct buffer_head **);

void *nilfs_palloc_block_get_entry(const struct inode *, __u64,

fs/nilfs2/bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ int nilfs_bmap_lookup_at_level(struct nilfs_bmap *bmap, __u64 key, int level, 
}



int nilfs_bmap_lookup_contig(struct nilfs_bmap *bmap, __u64 key, __u64 *ptrp,

			     unsigned maxblocks)

			     unsigned int maxblocks)

{

	int ret;

fs/nilfs2/bmap.h

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct nilfs_bmap_stats { 
struct nilfs_bmap_operations {

	int (*bop_lookup)(const struct nilfs_bmap *, __u64, int, __u64 *);

	int (*bop_lookup_contig)(const struct nilfs_bmap *, __u64, __u64 *,

				 unsigned);

				 unsigned int);

	int (*bop_insert)(struct nilfs_bmap *, __u64, __u64);

	int (*bop_delete)(struct nilfs_bmap *, __u64);

	void (*bop_clear)(struct nilfs_bmap *);
@@ -150,7 +150,7 @@ struct nilfs_bmap_store { 
int nilfs_bmap_test_and_clear_dirty(struct nilfs_bmap *);

int nilfs_bmap_read(struct nilfs_bmap *, struct nilfs_inode *);

void nilfs_bmap_write(struct nilfs_bmap *, struct nilfs_inode *);

int nilfs_bmap_lookup_contig(struct nilfs_bmap *, __u64, __u64 *, unsigned);

int nilfs_bmap_lookup_contig(struct nilfs_bmap *, __u64, __u64 *, unsigned int);

int nilfs_bmap_insert(struct nilfs_bmap *bmap, __u64 key, unsigned long rec);

int nilfs_bmap_delete(struct nilfs_bmap *bmap, __u64 key);

int nilfs_bmap_seek_key(struct nilfs_bmap *bmap, __u64 start, __u64 *keyp);

fs/nilfs2/btree.c

+2 −1
Original line number Diff line number Diff line
@@ -685,7 +685,8 @@ static int nilfs_btree_lookup(const struct nilfs_bmap *btree, 
}



static int nilfs_btree_lookup_contig(const struct nilfs_bmap *btree,

				     __u64 key, __u64 *ptrp, unsigned maxblocks)

				     __u64 key, __u64 *ptrp,

				     unsigned int maxblocks)

{

	struct nilfs_btree_path *path;

	struct nilfs_btree_node *node;