[PATCH v7 05/38] rollback_lock_file(): exit early if lock is not active
flat view
DORMANTno replies
REVIEWED: 2 (0M)
From: Michael Haggerty <hidden>
Date: 2016-06-15 23:02:37
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v7 of 6 in this series; 2 review trailers.
Revisions (6)
Eliminate a layer of nesting. Signed-off-by: Michael Haggerty <redacted> Reviewed-by: Ronnie Sahlberg <redacted> Reviewed-by: Jonathan Nieder <redacted> --- lockfile.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/lockfile.c b/lockfile.c
index 5330d6a..e55149a 100644
--- a/lockfile.c
+++ b/lockfile.c@@ -276,10 +276,11 @@ int hold_locked_index(struct lock_file *lk, int die_on_error) void rollback_lock_file(struct lock_file *lk) { - if (lk->filename[0]) { - if (lk->fd >= 0) - close(lk->fd); - unlink_or_warn(lk->filename); - lk->filename[0] = 0; - } + if (!lk->filename[0]) + return; + + if (lk->fd >= 0) + close(lk->fd); + unlink_or_warn(lk->filename); + lk->filename[0] = 0; }
--
2.1.0