Merge "Don't use TEMP_FAILURE_RETRY on close in recovery."

This commit is contained in:
Elliott Hughes
2015-05-16 01:08:54 +00:00
committed by Gerrit Code Review
+2 -2
View File
@@ -694,7 +694,7 @@ static int WriteStash(const char* base, const char* id, int blocks, uint8_t* buf
wsout: wsout:
if (fd != -1) { if (fd != -1) {
TEMP_FAILURE_RETRY(close(fd)); close(fd);
} }
if (fn) { if (fn) {
@@ -1732,7 +1732,7 @@ pbiudone:
if (fsync(params.fd) == -1) { if (fsync(params.fd) == -1) {
fprintf(stderr, "fsync failed: %s\n", strerror(errno)); fprintf(stderr, "fsync failed: %s\n", strerror(errno));
} }
TEMP_FAILURE_RETRY(close(params.fd)); close(params.fd);
} }
if (logcmd) { if (logcmd) {