f2fs: simplify __allocate_data_block

Just use a simple if block for the conditional call to
inc_valid_block_count.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index efd3eba..697020c 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1431,13 +1431,12 @@ static int __allocate_data_block(struct dnode_of_data *dn, int seg_type)
                return err;
 
        dn->data_blkaddr = f2fs_data_blkaddr(dn);
-       if (dn->data_blkaddr != NULL_ADDR)
-               goto alloc;
-
-       if (unlikely((err = inc_valid_block_count(sbi, dn->inode, &count))))
-               return err;
+       if (dn->data_blkaddr == NULL_ADDR) {
+               err = inc_valid_block_count(sbi, dn->inode, &count);
+               if (unlikely(err))
+                       return err;
+       }
 
-alloc:
        set_summary(&sum, dn->nid, dn->ofs_in_node, ni.version);
        old_blkaddr = dn->data_blkaddr;
        f2fs_allocate_data_block(sbi, NULL, old_blkaddr, &dn->data_blkaddr,