From: Michael Haggerty Date: Wed, 01 Oct 2014 10:28:19 GMT Subject: [PATCH v7 15/38] remove_lock_file(): call rollback_lock_file() Message-ID: <1412159322-2622-16-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1412159322-2622-1-git-send-email-mhagger@alum.mit.edu> It does just what we need. Signed-off-by: Michael Haggerty Reviewed-by: Jonathan Nieder --- lockfile.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lockfile.c b/lockfile.c index a8f32e5..f8205f6 100644 --- a/lockfile.c +++ b/lockfile.c @@ -53,12 +53,8 @@ static void remove_lock_file(void) pid_t me = getpid(); while (lock_file_list) { - if (lock_file_list->owner == me && - lock_file_list->filename[0]) { - if (lock_file_list->fd >= 0) - close(lock_file_list->fd); - unlink_or_warn(lock_file_list->filename); - } + if (lock_file_list->owner == me) + rollback_lock_file(lock_file_list); lock_file_list = lock_file_list->next; } } -- 2.1.0