From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Johannes Sixt" <j6t@kdbg.org>,
"Torsten Bögershausen" <tboegi@web.de>,
"Jeff King" <peff@peff.net>,
"Ronnie Sahlberg" <sahlberg@google.com>,
"Jonathan Nieder" <jrnieder@gmail.com>,
git@vger.kernel.org, "Michael Haggerty" <mhagger@alum.mit.edu>
Subject: [PATCH v7 15/38] remove_lock_file(): call rollback_lock_file()
Date: Wed, 1 Oct 2014 12:28:19 +0200 [thread overview]
Message-ID: <1412159322-2622-16-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1412159322-2622-1-git-send-email-mhagger@alum.mit.edu>
It does just what we need.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
---
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
next prev parent reply other threads:[~2014-10-01 10:30 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-01 10:28 [PATCH v7 00/38] Lockfile correctness and refactoring Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 01/38] unable_to_lock_die(): rename function from unable_to_lock_index_die() Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 02/38] api-lockfile: revise and expand the documentation Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 03/38] close_lock_file(): exit (successfully) if file is already closed Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 04/38] rollback_lock_file(): do not clear filename redundantly Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 05/38] rollback_lock_file(): exit early if lock is not active Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 06/38] rollback_lock_file(): set fd to -1 Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 07/38] lockfile: unlock file if lockfile permissions cannot be adjusted Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 08/38] hold_lock_file_for_append(): release lock on errors Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 09/38] lock_file(): always initialize and register lock_file object Michael Haggerty
2014-10-01 11:27 ` René Scharfe
2014-10-01 11:38 ` Michael Haggerty
2014-10-01 20:36 ` Junio C Hamano
2014-10-01 10:28 ` [PATCH v7 10/38] lockfile.c: document the various states of lock_file objects Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 11/38] cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LEN Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 12/38] delete_ref_loose(): don't muck around in the lock_file's filename Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 13/38] prepare_index(): declare return value to be (const char *) Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 14/38] lock_file(): exit early if lockfile cannot be opened Michael Haggerty
2014-10-01 10:28 ` Michael Haggerty [this message]
2014-10-01 10:28 ` [PATCH v7 16/38] commit_lock_file(): inline temporary variable Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 17/38] commit_lock_file(): die() if called for unlocked lockfile object Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 18/38] close_lock_file(): if close fails, roll back Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 19/38] commit_lock_file(): rollback lock file on failure to rename Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 20/38] api-lockfile: document edge cases Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 21/38] dump_marks(): remove a redundant call to rollback_lock_file() Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 22/38] git_config_set_multivar_in_file(): avoid " Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 23/38] lockfile: avoid transitory invalid states Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 24/38] struct lock_file: declare some fields volatile Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 25/38] try_merge_strategy(): remove redundant lock_file allocation Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 26/38] try_merge_strategy(): use a statically-allocated lock_file object Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 27/38] commit_lock_file(): use a strbuf to manage temporary space Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 28/38] Change lock_file::filename into a strbuf Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 29/38] resolve_symlink(): use a strbuf for internal scratch space Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 30/38] resolve_symlink(): take a strbuf parameter Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 31/38] trim_last_path_component(): replace last_path_elm() Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 32/38] Extract a function commit_lock_file_to() Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 33/38] Rename LOCK_NODEREF to LOCK_NO_DEREF Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 34/38] lockfile.c: rename static functions Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 35/38] get_locked_file_path(): new function Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 36/38] hold_lock_file_for_append(): restore errno before returning Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 37/38] Move read_index() definition to read-cache.c Michael Haggerty
2014-10-01 10:28 ` [PATCH v7 38/38] lockfile.h: extract new header file for the functions in lockfile.c Michael Haggerty
2014-10-01 21:05 ` [PATCH v7 00/38] Lockfile correctness and refactoring Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1412159322-2622-16-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=sahlberg@google.com \
--cc=tboegi@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).