sha1_file: rename git_open_noatime() to git_open()

This function is meant to be used when reading from files in the
object store, and the original objective was to avoid smudging atime
of loose object files too often, hence its name.  Because we'll be
extending its role in the next commit to also arrange the file
descriptors they return auto-closed in the child processes, rename
it to lose "noatime" part that is too specific.

Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 1e7c2a98a5617b8b42422c22051c5f61b2510751..0fd52bd6b4b985b24d93ab7fb9887f57305b49fd 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -720,7 +720,7 @@ static off_t write_reused_pack(struct sha1file *f)
        if (!is_pack_valid(reuse_packfile))
                die("packfile is invalid: %s", reuse_packfile->pack_name);
 
        if (!is_pack_valid(reuse_packfile))
                die("packfile is invalid: %s", reuse_packfile->pack_name);
 

-       fd = git_open_noatime(reuse_packfile->pack_name);
+       fd = git_open(reuse_packfile->pack_name);

        if (fd < 0)
                die_errno("unable to open packfile for reuse: %s",
                          reuse_packfile->pack_name);
        if (fd < 0)
                die_errno("unable to open packfile for reuse: %s",
                          reuse_packfile->pack_name);

diff --git a/cache.h b/cache.h
index 0dc39a998cb246b8eb22bc6def8a0900a14e2ee2..a902ca1f8e4d63ebc2a4605b03ac4369eaaaa566 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1122,7 +1122,7 @@ extern int write_sha1_file(const void *buf, unsigned long len, const char *type,
 extern int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type, unsigned char *sha1, unsigned flags);
 extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *);
 extern int force_object_loose(const unsigned char *sha1, time_t mtime);
 extern int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type, unsigned char *sha1, unsigned flags);
 extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *);
 extern int force_object_loose(const unsigned char *sha1, time_t mtime);

-extern int git_open_noatime(const char *name);
+extern int git_open(const char *name);

 extern void *map_sha1_file(const unsigned char *sha1, unsigned long *size);
 extern int unpack_sha1_header(git_zstream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz);
 extern int parse_sha1_header(const char *hdr, unsigned long *sizep);
 extern void *map_sha1_file(const unsigned char *sha1, unsigned long *size);
 extern int unpack_sha1_header(git_zstream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz);
 extern int parse_sha1_header(const char *hdr, unsigned long *sizep);

diff --git a/pack-bitmap.c b/pack-bitmap.c
index b949e517167dbac6c4c347e0a2cbdf8ca2dabbcf..39bcc168463fc7358ab7cb4e963e6ed8bde94804 100644 (file)
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -266,7 +266,7 @@ static int open_pack_bitmap_1(struct packed_git *packfile)
                return -1;
 
        idx_name = pack_bitmap_filename(packfile);
                return -1;
 
        idx_name = pack_bitmap_filename(packfile);

-       fd = git_open_noatime(idx_name);
+       fd = git_open(idx_name);

        free(idx_name);
 
        if (fd < 0)
        free(idx_name);
 
        if (fd < 0)

diff --git a/sha1_file.c b/sha1_file.c
index 266152de36a099bfa75bfaa8429f0234c52a80b1..5d2bcd3ed13cb2ca2a4645fdc968ed4580dcaf35 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -370,7 +370,7 @@ void read_info_alternates(const char * relative_base, int depth)
        int fd;
 
        path = xstrfmt("%s/info/alternates", relative_base);
        int fd;
 
        path = xstrfmt("%s/info/alternates", relative_base);

-       fd = git_open_noatime(path);
+       fd = git_open(path);

        free(path);
        if (fd < 0)
                return;
        free(path);
        if (fd < 0)
                return;


@@ -663,7 +663,7 @@ static int check_packed_git_idx(const char *path, struct packed_git *p)
        struct pack_idx_header *hdr;
        size_t idx_size;
        uint32_t version, nr, i, *index;
        struct pack_idx_header *hdr;
        size_t idx_size;
        uint32_t version, nr, i, *index;

-       int fd = git_open_noatime(path);
+       int fd = git_open(path);

        struct stat st;
 
        if (fd < 0)
        struct stat st;
 
        if (fd < 0)


@@ -1069,7 +1069,7 @@ static int open_packed_git_1(struct packed_git *p)
        while (pack_max_fds <= pack_open_fds && close_one_pack())
                ; /* nothing */
 
        while (pack_max_fds <= pack_open_fds && close_one_pack())
                ; /* nothing */
 

-       p->pack_fd = git_open_noatime(p->pack_name);
+       p->pack_fd = git_open(p->pack_name);

        if (p->pack_fd < 0 || fstat(p->pack_fd, &st))
                return -1;
        pack_open_fds++;
        if (p->pack_fd < 0 || fstat(p->pack_fd, &st))
                return -1;
        pack_open_fds++;


@@ -1559,7 +1559,7 @@ int check_sha1_signature(const unsigned char *sha1, void *map,
        return hashcmp(sha1, real_sha1) ? -1 : 0;
 }
 
        return hashcmp(sha1, real_sha1) ? -1 : 0;
 }
 

-int git_open_noatime(const char *name)
+int git_open(const char *name)

 {
        static int sha1_file_open_flag = O_NOATIME;
 
 {
        static int sha1_file_open_flag = O_NOATIME;
 


@@ -1605,7 +1605,7 @@ static int open_sha1_file(const unsigned char *sha1)
        struct alternate_object_database *alt;
        int most_interesting_errno;
 
        struct alternate_object_database *alt;
        int most_interesting_errno;
 

-       fd = git_open_noatime(sha1_file_name(sha1));
+       fd = git_open(sha1_file_name(sha1));

        if (fd >= 0)
                return fd;
        most_interesting_errno = errno;
        if (fd >= 0)
                return fd;
        most_interesting_errno = errno;


@@ -1613,7 +1613,7 @@ static int open_sha1_file(const unsigned char *sha1)
        prepare_alt_odb();
        for (alt = alt_odb_list; alt; alt = alt->next) {
                const char *path = alt_sha1_path(alt, sha1);
        prepare_alt_odb();
        for (alt = alt_odb_list; alt; alt = alt->next) {
                const char *path = alt_sha1_path(alt, sha1);

-               fd = git_open_noatime(path);
+               fd = git_open(path);

                if (fd >= 0)
                        return fd;
                if (most_interesting_errno == ENOENT)
                if (fd >= 0)
                        return fd;
                if (most_interesting_errno == ENOENT)