Btrfs-progs: receive: remove return type of close_inode_for_write
authorRakesh Pandit <rakesh@tuxera.com>
Fri, 18 Apr 2014 23:14:14 +0000 (02:14 +0300)
committerDavid Sterba <dsterba@suse.cz>
Fri, 2 May 2014 15:03:39 +0000 (17:03 +0200)
"close_inode_for_write" always returns 0, so just remove its return
value and remove dead checking in caller.

Signed-off-by: Rakesh Pandit <rakesh@tuxera.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
cmds-receive.c

index d6cd3da45dbe409d6ad3b17948c4237d9735189e..8d85ca92c788430e3bc09f422bca6123d28c89a8 100644 (file)
@@ -523,19 +523,14 @@ out:
        return ret;
 }
 
-static int close_inode_for_write(struct btrfs_receive *r)
+static void close_inode_for_write(struct btrfs_receive *r)
 {
-       int ret = 0;
-
        if(r->write_fd == -1)
-               goto out;
+               return;
 
        close(r->write_fd);
        r->write_fd = -1;
        r->write_path[0] = 0;
-
-out:
-       return ret;
 }
 
 static int process_write(const char *path, const void *data, u64 offset,
@@ -879,9 +874,7 @@ static int do_receive(struct btrfs_receive *r, const char *tomnt, int r_fd)
                if (ret)
                        end = 1;
 
-               ret = close_inode_for_write(r);
-               if (ret < 0)
-                       goto out;
+               close_inode_for_write(r);
                ret = finish_subvol(r);
                if (ret < 0)
                        goto out;