[PATCH v7 19/38] commit_lock_file(): rollback lock file on failure to rename
DORMANTno replies
From: Michael Haggerty <hidden>
Date: 2016-06-15 23:02:37
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v7 of 6 in this series.
Revisions (6)
If rename() fails, call rollback_lock_file() to delete the lock file (in case it is still present) and reset the filename field to the empty string so that the lockfile object is left in a valid state. Signed-off-by: Michael Haggerty <redacted> --- lockfile.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lockfile.c b/lockfile.c
index 1d18c67..728ce49 100644
--- a/lockfile.c
+++ b/lockfile.c@@ -318,8 +318,13 @@ int commit_lock_file(struct lock_file *lk) /* remove ".lock": */ result_file[strlen(result_file) - LOCK_SUFFIX_LEN] = 0; - if (rename(lk->filename, result_file)) + if (rename(lk->filename, result_file)) { + int save_errno = errno; + rollback_lock_file(lk); + errno = save_errno; return -1; + } + lk->filename[0] = 0; return 0; }
--
2.1.0