OSDN Git Service

btrfs: cleanup duplicate return value in insert_inline_extent
authorDavid Sterba <dsterba@suse.com>
Thu, 15 Jun 2017 17:09:51 +0000 (19:09 +0200)
committerDavid Sterba <dsterba@suse.com>
Tue, 20 Jun 2017 12:22:12 +0000 (14:22 +0200)
The pattern when err is used for function exit and ret is used for
return values of callees is not used here.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/inode.c

index a21a984..e837713 100644 (file)
@@ -177,7 +177,6 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans,
        char *kaddr;
        unsigned long ptr;
        struct btrfs_file_extent_item *ei;
-       int err = 0;
        int ret;
        size_t cur_size = size;
        unsigned long offset;
@@ -199,10 +198,8 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans,
                path->leave_spinning = 1;
                ret = btrfs_insert_empty_item(trans, root, path, &key,
                                              datasize);
-               if (ret) {
-                       err = ret;
+               if (ret)
                        goto fail;
-               }
        }
        leaf = path->nodes[0];
        ei = btrfs_item_ptr(leaf, path->slots[0],
@@ -257,9 +254,8 @@ static int insert_inline_extent(struct btrfs_trans_handle *trans,
        BTRFS_I(inode)->disk_i_size = inode->i_size;
        ret = btrfs_update_inode(trans, root, inode);
 
-       return ret;
 fail:
-       return err;
+       return ret;
 }