From 0970da718061da0799091fc0e4fc68119fcc8b22 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Wed, 8 Jan 2020 09:18:32 +0100 Subject: [PATCH] virchrdev: Drop needless 'cleanup' label in virChrdevLockFileCreate() Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- src/conf/virchrdev.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index 766c264472..800e82869e 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -105,14 +105,13 @@ static char *virChrdevLockFilePath(const char *dev) static int virChrdevLockFileCreate(const char *dev) { g_autofree char *path = NULL; - int ret = -1; g_autofree char *pidStr = NULL; VIR_AUTOCLOSE lockfd = -1; pid_t pid; /* build lock file path */ if (!(path = virChrdevLockFilePath(dev))) - goto cleanup; + return -1; /* check if a log file and process holding the lock still exists */ if (virPidFileReadPathIfAlive(path, &pid, NULL) == 0 && pid >= 0) { @@ -121,7 +120,7 @@ static int virChrdevLockFileCreate(const char *dev) _("Requested device '%s' is locked by " "lock file '%s' held by process %lld"), dev, path, (long long) pid); - goto cleanup; + return -1; } else { /* clean up the stale/corrupted/nonexistent lockfile */ unlink(path); @@ -142,14 +141,13 @@ static int virChrdevLockFileCreate(const char *dev) if (errno == EACCES && geteuid() != 0) { VIR_DEBUG("Skipping lock file creation for device '%s in path '%s'.", dev, path); - ret = 0; - goto cleanup; + return 0; } virReportSystemError(errno, _("Couldn't create lock file for " "device '%s' in path '%s'"), dev, path); - goto cleanup; + return -1; } /* write the pid to the file */ @@ -159,15 +157,11 @@ static int virChrdevLockFileCreate(const char *dev) "device '%s' in path '%s'"), dev, path); unlink(path); - goto cleanup; + return -1; } /* we hold the lock */ - ret = 0; - - cleanup: - - return ret; + return 0; } /**