From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ryusuke Konishi Subject: Re: [PATCH] nilfs2: trivial coding style fix Date: Mon, 07 Dec 2009 19:32:53 +0900 (JST) Message-ID: <20091207.193253.21318758.ryusuke@osrg.net> References: <20091204.200102.43716794.ryusuke@osrg.net> <873a3rymi5.wl%jir@sekiba.com> <874oo4lhzn.wl%jir@sekiba.com> Reply-To: NILFS Users mailing list Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <874oo4lhzn.wl%jir-27yqGEOhnJbQT0dZR+AlfA@public.gmane.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: users-bounces-JrjvKiOkagjYtjvyW6yDsg@public.gmane.org Errors-To: users-bounces-JrjvKiOkagjYtjvyW6yDsg@public.gmane.org To: users-JrjvKiOkagjYtjvyW6yDsg@public.gmane.org, jir-27yqGEOhnJbQT0dZR+AlfA@public.gmane.org Cc: konishi.ryusuke-Zyj7fXuS5i5L9jVzuh4AOg@public.gmane.org Hi, On Sun, 06 Dec 2009 15:43:56 +0900, Jiro SEKIBA wrote: > Hi, > > I re-read the comment and realized that there are some room > to simplify the sytyle. This is a re-revised version. > > This is a trivial style fix patch to mend errors/warnings > reported by "checkpatch.pl --file". > > Signed-off-by: Jiro SEKIBA > --- > fs/nilfs2/bmap.c | 4 ++-- > fs/nilfs2/cpfile.c | 31 ++++++++++++++++++------------- > fs/nilfs2/direct.c | 17 +++++++++-------- > 3 files changed, 29 insertions(+), 23 deletions(-) Looks good. I'll queue it up. Thanks, Ryusuke Konishi > diff --git a/fs/nilfs2/bmap.c b/fs/nilfs2/bmap.c > index f4a14ea..effdbdb 100644 > --- a/fs/nilfs2/bmap.c > +++ b/fs/nilfs2/bmap.c > @@ -417,8 +417,8 @@ __u64 nilfs_bmap_data_get_key(const struct nilfs_bmap *bmap, > > key = page_index(bh->b_page) << (PAGE_CACHE_SHIFT - > bmap->b_inode->i_blkbits); > - for (pbh = page_buffers(bh->b_page); pbh != bh; > - pbh = pbh->b_this_page, key++); > + for (pbh = page_buffers(bh->b_page); pbh != bh; pbh = pbh->b_this_page) > + key++; > > return key; > } > diff --git a/fs/nilfs2/cpfile.c b/fs/nilfs2/cpfile.c > index d5ad54e..1873781 100644 > --- a/fs/nilfs2/cpfile.c > +++ b/fs/nilfs2/cpfile.c > @@ -328,19 +328,24 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile, > tnicps += nicps; > nilfs_mdt_mark_buffer_dirty(cp_bh); > nilfs_mdt_mark_dirty(cpfile); > - if (!nilfs_cpfile_is_in_first(cpfile, cno) && > - (count = nilfs_cpfile_block_sub_valid_checkpoints( > - cpfile, cp_bh, kaddr, nicps)) == 0) { > - /* make hole */ > - kunmap_atomic(kaddr, KM_USER0); > - brelse(cp_bh); > - ret = nilfs_cpfile_delete_checkpoint_block( > - cpfile, cno); > - if (ret == 0) > - continue; > - printk(KERN_ERR "%s: cannot delete block\n", > - __func__); > - break; > + if (!nilfs_cpfile_is_in_first(cpfile, cno)) { > + count = > + nilfs_cpfile_block_sub_valid_checkpoints( > + cpfile, cp_bh, kaddr, nicps); > + if (count == 0) { > + /* make hole */ > + kunmap_atomic(kaddr, KM_USER0); > + brelse(cp_bh); > + ret = > + nilfs_cpfile_delete_checkpoint_block( > + cpfile, cno); > + if (ret == 0) > + continue; > + printk(KERN_ERR > + "%s: cannot delete block\n", > + __func__); > + break; > + } > } > } > > diff --git a/fs/nilfs2/direct.c b/fs/nilfs2/direct.c > index d369ac7..236753d 100644 > --- a/fs/nilfs2/direct.c > +++ b/fs/nilfs2/direct.c > @@ -51,11 +51,11 @@ static int nilfs_direct_lookup(const struct nilfs_bmap *bmap, > struct nilfs_direct *direct; > __u64 ptr; > > - direct = (struct nilfs_direct *)bmap; > - if ((key > NILFS_DIRECT_KEY_MAX) || > - (level != 1) || /* XXX: use macro for level 1 */ > - ((ptr = nilfs_direct_get_ptr(direct, key)) == > - NILFS_BMAP_INVALID_PTR)) > + direct = (struct nilfs_direct *)bmap; /* XXX: use macro for level 1 */ > + if (key > NILFS_DIRECT_KEY_MAX || level != 1) > + return -ENOENT; > + ptr = nilfs_direct_get_ptr(direct, key); > + if (ptr == NILFS_BMAP_INVALID_PTR) > return -ENOENT; > > if (ptrp != NULL) > @@ -73,9 +73,10 @@ static int nilfs_direct_lookup_contig(const struct nilfs_bmap *bmap, > sector_t blocknr; > int ret, cnt; > > - if (key > NILFS_DIRECT_KEY_MAX || > - (ptr = nilfs_direct_get_ptr(direct, key)) == > - NILFS_BMAP_INVALID_PTR) > + if (key > NILFS_DIRECT_KEY_MAX) > + return -ENOENT; > + ptr = nilfs_direct_get_ptr(direct, key); > + if (ptr == NILFS_BMAP_INVALID_PTR) > return -ENOENT; > > if (NILFS_BMAP_USE_VBN(bmap)) { > -- > 1.5.6.5