[PATCH v2 14/25] lock_file(): exit early if lockfile cannot be opened
flat view
STALE3767d
From: Michael Haggerty <hidden>
Date: 2016-06-15 23:00:38
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v2 of 6 in this series.
Revisions (6)
This is a bit easier to read than the old version, which nested part of the non-error code in an "if" block. Signed-off-by: Michael Haggerty <redacted> --- lockfile.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/lockfile.c b/lockfile.c
index 1bd0ae1..0879214 100644
--- a/lockfile.c
+++ b/lockfile.c@@ -213,16 +213,16 @@ static int lock_file(struct lock_file *lk, const char *path, int flags) resolve_symlink(lk->filename, max_path_len); strcat(lk->filename, ".lock"); lk->fd = open(lk->filename, O_RDWR | O_CREAT | O_EXCL, 0666); - if (0 <= lk->fd) { - lk->owner = getpid(); - if (adjust_shared_perm(lk->filename)) { - error("cannot fix permission bits on %s", lk->filename); - rollback_lock_file(lk); - return -1; - } - } - else + if (lk->fd < 0) { lk->filename[0] = 0; + return -1; + } + lk->owner = getpid(); + if (adjust_shared_perm(lk->filename)) { + error("cannot fix permission bits on %s", lk->filename); + rollback_lock_file(lk); + return -1; + } return lk->fd; }
--
1.9.1