From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 9 Dec 2020 10:31:53 +0000 (+0100)
Subject: lxclock: cleanup lxcunlock()
X-Git-Tag: lxc-5.0.0~330^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=129c915f8d5a398529bc2c44ac7f152b90969565;p=thirdparty%2Flxc.git

lxclock: cleanup lxcunlock()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/lxclock.c b/src/lxc/lxclock.c
index 515cae748..a08f56985 100644
--- a/src/lxc/lxclock.c
+++ b/src/lxc/lxclock.c
@@ -221,42 +221,34 @@ int lxclock(struct lxc_lock *l, int timeout)
 int lxcunlock(struct lxc_lock *l)
 {
 	struct flock lk;
-	int ret = 0, saved_errno = errno;
+	int ret = 0;
 
 	switch (l->type) {
 	case LXC_LOCK_ANON_SEM:
-		if (!l->u.sem) {
-			ret = -2;
-		} else {
-			ret = sem_post(l->u.sem);
-			saved_errno = errno;
-		}
+		if (!l->u.sem)
+			return -2;
 
+		ret = sem_post(l->u.sem);
 		break;
 	case LXC_LOCK_FLOCK:
-		if (l->u.f.fd >= 0) {
-			memset(&lk, 0, sizeof(struct flock));
+		if (l->u.f.fd < 0)
+			return -2;
 
-			lk.l_type = F_UNLCK;
-			lk.l_whence = SEEK_SET;
+		memset(&lk, 0, sizeof(struct flock));
 
-			ret = fcntl(l->u.f.fd, F_OFD_SETLK, &lk);
-			if (ret < 0) {
-				if (errno == EINVAL)
-					ret = flock(l->u.f.fd, LOCK_EX | LOCK_NB);
-				saved_errno = errno;
-			}
+		lk.l_type = F_UNLCK;
+		lk.l_whence = SEEK_SET;
 
-			close(l->u.f.fd);
-			l->u.f.fd = -1;
-		} else {
-			ret = -2;
-		}
+		ret = fcntl(l->u.f.fd, F_OFD_SETLK, &lk);
+		if (ret < 0 && errno == EINVAL)
+			ret = flock(l->u.f.fd, LOCK_EX | LOCK_NB);
 
+		close_prot_errno_disarm(l->u.f.fd);
 		break;
+	default:
+		return ret_set_errno(-1, EINVAL);
 	}
 
-	errno = saved_errno;
 	return ret;
 }