redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

nilfs2: unify type of key arguments in bmap interface

Browse source 
The type of key arguments in block mapping interface varies depending
on function.  For instance, nilfs_bmap_lookup_at_level() takes "__u64"
for its key argument whereas nilfs_bmap_lookup() takes "unsigned
long".

This fits them to "__u64" to eliminate the variation.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ryusuke Konishi 2015-04-16 12:46:34 -07:00 committed by Linus Torvalds
parent 0de6d6b9a2
commit 3568a13f40
4 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/nilfs2/alloc.c
View file

@ -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, static int nilfs_palloc_count_desc_blocks(struct inode *inode,
unsigned long *desc_blocks) unsigned long *desc_blocks)
{ {
unsigned long blknum; __u64 blknum;
int ret; int ret;
ret = nilfs_bmap_last_key(NILFS_I(inode)->i_bmap, &blknum); ret = nilfs_bmap_last_key(NILFS_I(inode)->i_bmap, &blknum);
if (likely(!ret)) if (likely(!ret))
*desc_blocks = DIV_ROUND_UP( *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; return ret;
} }

17
fs/nilfs2/bmap.c
View file

@ -152,9 +152,7 @@ static int nilfs_bmap_do_insert(struct nilfs_bmap *bmap, __u64 key, __u64 ptr)
* *
* %-EEXIST - A record associated with @key already exist. * %-EEXIST - A record associated with @key already exist.
*/ */
int nilfs_bmap_insert(struct nilfs_bmap *bmap, int nilfs_bmap_insert(struct nilfs_bmap *bmap, __u64 key, unsigned long rec)
unsigned long key,
unsigned long rec)
{ {
int ret; int ret;
@ -191,19 +189,16 @@ static int nilfs_bmap_do_delete(struct nilfs_bmap *bmap, __u64 key)
return bmap->b_ops->bop_delete(bmap, key); return bmap->b_ops->bop_delete(bmap, key);
} }
int nilfs_bmap_last_key(struct nilfs_bmap *bmap, unsigned long *key) int nilfs_bmap_last_key(struct nilfs_bmap *bmap, __u64 *keyp)
{ {
__u64 lastkey;
int ret; int ret;
down_read(&bmap->b_sem); down_read(&bmap->b_sem);
ret = bmap->b_ops->bop_last_key(bmap, &lastkey); ret = bmap->b_ops->bop_last_key(bmap, keyp);
up_read(&bmap->b_sem); up_read(&bmap->b_sem);
if (ret < 0) if (ret < 0)
ret = nilfs_bmap_convert_error(bmap, __func__, ret); ret = nilfs_bmap_convert_error(bmap, __func__, ret);
else
*key = lastkey;
return ret; return ret;
} }
@ -224,7 +219,7 @@ int nilfs_bmap_last_key(struct nilfs_bmap *bmap, unsigned long *key)
* *
* %-ENOENT - A record associated with @key does not exist. * %-ENOENT - A record associated with @key does not exist.
*/ */
int nilfs_bmap_delete(struct nilfs_bmap *bmap, unsigned long key) int nilfs_bmap_delete(struct nilfs_bmap *bmap, __u64 key)
{ {
int ret; int ret;
@ -235,7 +230,7 @@ int nilfs_bmap_delete(struct nilfs_bmap *bmap, unsigned long key)
return nilfs_bmap_convert_error(bmap, __func__, ret); return nilfs_bmap_convert_error(bmap, __func__, ret);
} }
static int nilfs_bmap_do_truncate(struct nilfs_bmap *bmap, unsigned long key) static int nilfs_bmap_do_truncate(struct nilfs_bmap *bmap, __u64 key)
{ {
__u64 lastkey; __u64 lastkey;
int ret; int ret;
@ -276,7 +271,7 @@ static int nilfs_bmap_do_truncate(struct nilfs_bmap *bmap, unsigned long key)
* *
* %-ENOMEM - Insufficient amount of memory available. * %-ENOMEM - Insufficient amount of memory available.
*/ */
int nilfs_bmap_truncate(struct nilfs_bmap *bmap, unsigned long key) int nilfs_bmap_truncate(struct nilfs_bmap *bmap, __u64 key)
{ {
int ret; int ret;

8
fs/nilfs2/bmap.h
View file

@ -153,10 +153,10 @@ int nilfs_bmap_test_and_clear_dirty(struct nilfs_bmap *);
int nilfs_bmap_read(struct nilfs_bmap *, struct nilfs_inode *); int nilfs_bmap_read(struct nilfs_bmap *, struct nilfs_inode *);
void nilfs_bmap_write(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 nilfs_bmap_insert(struct nilfs_bmap *, unsigned long, unsigned long); int nilfs_bmap_insert(struct nilfs_bmap *bmap, __u64 key, unsigned long rec);
int nilfs_bmap_delete(struct nilfs_bmap *, unsigned long); int nilfs_bmap_delete(struct nilfs_bmap *bmap, __u64 key);
int nilfs_bmap_last_key(struct nilfs_bmap *, unsigned long *); int nilfs_bmap_last_key(struct nilfs_bmap *bmap, __u64 *keyp);
int nilfs_bmap_truncate(struct nilfs_bmap *, unsigned long); int nilfs_bmap_truncate(struct nilfs_bmap *bmap, __u64 key);
void nilfs_bmap_clear(struct nilfs_bmap *); void nilfs_bmap_clear(struct nilfs_bmap *);
int nilfs_bmap_propagate(struct nilfs_bmap *, struct buffer_head *); int nilfs_bmap_propagate(struct nilfs_bmap *, struct buffer_head *);
void nilfs_bmap_lookup_dirty_buffers(struct nilfs_bmap *, struct list_head *); void nilfs_bmap_lookup_dirty_buffers(struct nilfs_bmap *, struct list_head *);

6
fs/nilfs2/inode.c
View file

@ -106,7 +106,7 @@ int nilfs_get_block(struct inode *inode, sector_t blkoff,
err = nilfs_transaction_begin(inode->i_sb, &ti, 1); err = nilfs_transaction_begin(inode->i_sb, &ti, 1);
if (unlikely(err)) if (unlikely(err))
goto out; goto out;
err = nilfs_bmap_insert(ii->i_bmap, (unsigned long)blkoff, err = nilfs_bmap_insert(ii->i_bmap, blkoff,
(unsigned long)bh_result); (unsigned long)bh_result);
if (unlikely(err != 0)) { if (unlikely(err != 0)) {
if (err == -EEXIST) { if (err == -EEXIST) {
@ -714,7 +714,7 @@ void nilfs_update_inode(struct inode *inode, struct buffer_head *ibh, int flags)
static void nilfs_truncate_bmap(struct nilfs_inode_info *ii, static void nilfs_truncate_bmap(struct nilfs_inode_info *ii,
unsigned long from) unsigned long from)
{ {
unsigned long b; __u64 b;
int ret; int ret;
if (!test_bit(NILFS_I_BMAP, &ii->i_state)) if (!test_bit(NILFS_I_BMAP, &ii->i_state))
@ -729,7 +729,7 @@ repeat:
if (b < from) if (b < from)
return; return;
b -= min_t(unsigned long, NILFS_MAX_TRUNCATE_BLOCKS, b - from); b -= min_t(__u64, NILFS_MAX_TRUNCATE_BLOCKS, b - from);
ret = nilfs_bmap_truncate(ii->i_bmap, b); ret = nilfs_bmap_truncate(ii->i_bmap, b);
nilfs_relax_pressure_in_lock(ii->vfs_inode.i_sb); nilfs_relax_pressure_in_lock(ii->vfs_inode.i_sb);
if (!ret || (ret == -ENOMEM && if (!ret || (ret == -ENOMEM &&