[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 44/59] 9p-local.c: remove unneeded label in local_unlinkat_com
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH v1 44/59] 9p-local.c: remove unneeded label in local_unlinkat_common() |
Date: |
Mon, 6 Jan 2020 15:24:10 -0300 |
'err_out' can be replaced by 'return ret' in the error conditions
the jump was being made.
CC: Greg Kurz <address@hidden>
Signed-off-by: Daniel Henrique Barboza <address@hidden>
---
hw/9pfs/9p-local.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
index ca641390fb..f9bdd2ad7c 100644
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p-local.c
@@ -1094,12 +1094,12 @@ static int local_unlinkat_common(FsContext *ctx, int
dirfd, const char *name,
fd = openat_dir(dirfd, name);
if (fd == -1) {
- goto err_out;
+ return ret;
}
ret = unlinkat(fd, VIRTFS_META_DIR, AT_REMOVEDIR);
close_preserve_errno(fd);
if (ret < 0 && errno != ENOENT) {
- goto err_out;
+ return ret;
}
}
map_dirfd = openat_dir(dirfd, VIRTFS_META_DIR);
@@ -1107,16 +1107,14 @@ static int local_unlinkat_common(FsContext *ctx, int
dirfd, const char *name,
ret = unlinkat(map_dirfd, name, 0);
close_preserve_errno(map_dirfd);
if (ret < 0 && errno != ENOENT) {
- goto err_out;
+ return ret;
}
} else if (errno != ENOENT) {
- goto err_out;
+ return ret;
}
}
- ret = unlinkat(dirfd, name, flags);
-err_out:
- return ret;
+ return unlinkat(dirfd, name, flags);
}
static int local_remove(FsContext *ctx, const char *path)
--
2.24.1
- [PATCH v1 18/59] qcow2-refcount.c: remove unneeded 'fail' label in qcow2_refcount_init(), (continued)
- [PATCH v1 18/59] qcow2-refcount.c: remove unneeded 'fail' label in qcow2_refcount_init(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 23/59] block/vxhs.c: remove unneeded 'out' label in vxhs_iio_callback(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 31/59] util/aio-posix.c: remove unneeded 'out' label in aio_epoll, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 33/59] ipmi/ipmi_bmc_sim.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 39/59] usb/dev-mtp.c: remove unneeded label in write_retry(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 41/59] intc/s390_flic_kvm.c: remove unneeded label in kvm_flic_load(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 44/59] 9p-local.c: remove unneeded label in local_unlinkat_common(),
Daniel Henrique Barboza <=
- [PATCH v1 45/59] 9pfs/9p.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 47/59] pvrdma_main.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 49/59] rdma/rdma_rm.c: remove unneeded label in rdma_rm_alloc_pd(), Daniel Henrique Barboza, 2020/01/06
- [PATCH v1 51/59] virtio/vhost.c: remove unneeded labels, Daniel Henrique Barboza, 2020/01/06