Commit 5ee58148 authored by Jiro SEKIBA's avatar Jiro SEKIBA Committed by Ryusuke Konishi

nilfs2: trivial coding style fix

This is a trivial style fix patch to mend errors/warnings
reported by "checkpatch.pl --file".
Signed-off-by: default avatarJiro SEKIBA <jir@unicus.jp>
Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent 6b7b2849
...@@ -417,8 +417,8 @@ __u64 nilfs_bmap_data_get_key(const struct nilfs_bmap *bmap, ...@@ -417,8 +417,8 @@ __u64 nilfs_bmap_data_get_key(const struct nilfs_bmap *bmap,
key = page_index(bh->b_page) << (PAGE_CACHE_SHIFT - key = page_index(bh->b_page) << (PAGE_CACHE_SHIFT -
bmap->b_inode->i_blkbits); bmap->b_inode->i_blkbits);
for (pbh = page_buffers(bh->b_page); pbh != bh; for (pbh = page_buffers(bh->b_page); pbh != bh; pbh = pbh->b_this_page)
pbh = pbh->b_this_page, key++); key++;
return key; return key;
} }
......
...@@ -328,19 +328,24 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile, ...@@ -328,19 +328,24 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile,
tnicps += nicps; tnicps += nicps;
nilfs_mdt_mark_buffer_dirty(cp_bh); nilfs_mdt_mark_buffer_dirty(cp_bh);
nilfs_mdt_mark_dirty(cpfile); nilfs_mdt_mark_dirty(cpfile);
if (!nilfs_cpfile_is_in_first(cpfile, cno) && if (!nilfs_cpfile_is_in_first(cpfile, cno)) {
(count = nilfs_cpfile_block_sub_valid_checkpoints( count =
cpfile, cp_bh, kaddr, nicps)) == 0) { nilfs_cpfile_block_sub_valid_checkpoints(
/* make hole */ cpfile, cp_bh, kaddr, nicps);
kunmap_atomic(kaddr, KM_USER0); if (count == 0) {
brelse(cp_bh); /* make hole */
ret = nilfs_cpfile_delete_checkpoint_block( kunmap_atomic(kaddr, KM_USER0);
cpfile, cno); brelse(cp_bh);
if (ret == 0) ret =
continue; nilfs_cpfile_delete_checkpoint_block(
printk(KERN_ERR "%s: cannot delete block\n", cpfile, cno);
__func__); if (ret == 0)
break; continue;
printk(KERN_ERR
"%s: cannot delete block\n",
__func__);
break;
}
} }
} }
......
...@@ -51,11 +51,11 @@ static int nilfs_direct_lookup(const struct nilfs_bmap *bmap, ...@@ -51,11 +51,11 @@ static int nilfs_direct_lookup(const struct nilfs_bmap *bmap,
struct nilfs_direct *direct; struct nilfs_direct *direct;
__u64 ptr; __u64 ptr;
direct = (struct nilfs_direct *)bmap; direct = (struct nilfs_direct *)bmap; /* XXX: use macro for level 1 */
if ((key > NILFS_DIRECT_KEY_MAX) || if (key > NILFS_DIRECT_KEY_MAX || level != 1)
(level != 1) || /* XXX: use macro for level 1 */ return -ENOENT;
((ptr = nilfs_direct_get_ptr(direct, key)) == ptr = nilfs_direct_get_ptr(direct, key);
NILFS_BMAP_INVALID_PTR)) if (ptr == NILFS_BMAP_INVALID_PTR)
return -ENOENT; return -ENOENT;
if (ptrp != NULL) if (ptrp != NULL)
...@@ -73,9 +73,10 @@ static int nilfs_direct_lookup_contig(const struct nilfs_bmap *bmap, ...@@ -73,9 +73,10 @@ static int nilfs_direct_lookup_contig(const struct nilfs_bmap *bmap,
sector_t blocknr; sector_t blocknr;
int ret, cnt; int ret, cnt;
if (key > NILFS_DIRECT_KEY_MAX || if (key > NILFS_DIRECT_KEY_MAX)
(ptr = nilfs_direct_get_ptr(direct, key)) == return -ENOENT;
NILFS_BMAP_INVALID_PTR) ptr = nilfs_direct_get_ptr(direct, key);
if (ptr == NILFS_BMAP_INVALID_PTR)
return -ENOENT; return -ENOENT;
if (NILFS_BMAP_USE_VBN(bmap)) { if (NILFS_BMAP_USE_VBN(bmap)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment