Rakesh Pandit
2014-Apr-18 23:14 UTC
[PATCH 2/2] 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 <rakesh@tuxera.com>
---
cmds-receive.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/cmds-receive.c b/cmds-receive.c
index 7a23823..39309f2 100644
--- a/cmds-receive.c
+++ b/cmds-receive.c
@@ -612,19 +612,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,
@@ -1017,9 +1012,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;
--
1.8.5.3
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html