From 6ca8f9cfc28364cf7378b54df41008bc52478f2e Mon Sep 17 00:00:00 2001 From: Rakesh Pandit Date: Sat, 19 Apr 2014 02:14:14 +0300 Subject: Btrfs-progs: receive: remove return type of close_inode_for_write "close_inode_for_write" always returns 0, so just remove its return value and remove dead checking in caller. Signed-off-by: Rakesh Pandit Signed-off-by: David Sterba --- cmds-receive.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'cmds-receive.c') diff --git a/cmds-receive.c b/cmds-receive.c index d6cd3da..8d85ca9 100644 --- a/cmds-receive.c +++ b/cmds-receive.c @@ -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; -- cgit v1.2.1