diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-30 15:42:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-31 21:46:57 (GMT) |
| commit | 4c81b03e30d13dbc93ea7071438ef2da0acd4189 (patch) | |
| tree | 73459678fa41737c15a2957215d51bde97528ddf /csum-file.c | |
| parent | d2b3691b61d516a0ad2bf700a2a5d9113ceff0b1 (diff) | |
| download | git-4c81b03e30d13dbc93ea7071438ef2da0acd4189.zip git-4c81b03e30d13dbc93ea7071438ef2da0acd4189.tar.gz git-4c81b03e30d13dbc93ea7071438ef2da0acd4189.tar.bz2 | |
Make pack creation always fsync() the result
This means that we can depend on packs always being stable on disk,
simplifying a lot of the object serialization worries. And unlike loose
objects, serializing pack creation IO isn't going to be a performance
killer.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'csum-file.c')
| -rw-r--r-- | csum-file.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/csum-file.c b/csum-file.c index 9728a99..ace64f1 100644 --- a/csum-file.c +++ b/csum-file.c @@ -32,21 +32,24 @@ static void sha1flush(struct sha1file *f, unsigned int count) } } -int sha1close(struct sha1file *f, unsigned char *result, int final) +int sha1close(struct sha1file *f, unsigned char *result, unsigned int flags) { int fd; unsigned offset = f->offset; + if (offset) { SHA1_Update(&f->ctx, f->buffer, offset); sha1flush(f, offset); f->offset = 0; } - if (final) { + if (flags & (CSUM_CLOSE | CSUM_FSYNC)) { /* write checksum and close fd */ SHA1_Final(f->buffer, &f->ctx); if (result) hashcpy(result, f->buffer); sha1flush(f, 20); + if (flags & CSUM_FSYNC) + fsync_or_die(f->fd, f->name); if (close(f->fd)) die("%s: sha1 file error on close (%s)", f->name, strerror(errno)); |