[PATCH 06/32] read-cache: store in-memory flags in the first 12 bits of ce_flags
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Apr 28, 2014, 10:55 UTC
- Message-ID
- <1398682553-11634-7-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <1398682553-11634-1-git-send-email-pclouds@gmail.com>
We're running out of room for in-memory flags. But since b60e188 (Strip namelen out of ce_flags into a ce_namelen field - 2012-07-11), we copy the namelen (first 12 bits) to ce_namelen field. So those bits are free to use. Just make sure we do not accidentally write any in-memory flags back.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- cache.h | 2 +- read-cache.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cache.h b/cache.h index e44048c..57ad318 100644 --- a/cache.h +++ b/cache.h @@ -145,7 +145,7 @@ struct cache_entry { #define CE_STAGESHIFT 12 /* - * Range 0xFFFF0000 in ce_flags is divided into + * Range 0xFFFF0FFF in ce_flags is divided into * two parts: in-memory flags and on-disk ones. * Flags in CE_EXTENDED_FLAGS will get saved on-disk * if you want to save a new flag, add it in diff --git a/read-cache.c b/read-cache.c index 576e506..5761b1f 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1702,7 +1702,7 @@ static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk, ondisk->size = htonl(ce->ce_stat_data.sd_size); hashcpy(ondisk->sha1, ce->sha1); - flags = ce->ce_flags; + flags = ce->ce_flags & ~CE_NAMEMASK; flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce)); ondisk->flags = htons(flags); if (ce->ce_flags & CE_EXTENDED) {
-- 1.9.1.346.ga2b5940