This reverts commit 7734f04873cfaddd0b148074a633f1f824fd961f.
I guess that the revert commit, 7734f048, has been in test long
enough, and should now be reverted. I have not received any info
regarding any debug output of the reverted commit, so lets hope that
the lstat_cache() function do not cause any ping-pong.
Signed-off-by: Kjetil Barvik <barvik@xxxxxxxxxxxx>
---
Junio, I do not know what type of people who use, test and play
around with the master branch, but I guess that not all of them
expect to get a debug output from the program.
So, therefore, I have made this revert now, but you can decide when
it should be aplayed, now and right before the patch is merged into
master or right before the next release, v1.6.3, is made.
symlinks.c | 23 -----------------------
1 files changed, 0 insertions(+), 23 deletions(-)
diff --git a/symlinks.c b/symlinks.c
index cb255a3..1d6b35b 100644
--- a/symlinks.c
+++ b/symlinks.c
@@ -51,11 +51,6 @@ static inline void reset_lstat_cache(void)
*/
}
-#define SWITCHES_BEFORE_WARNING 10
-static unsigned int cache_switches, number_of_warnings;
-static unsigned int current_cache_func, last_cache_func;
-static unsigned int total_calls;
-
#define FL_DIR (1 << 0)
#define FL_NOENT (1 << 1)
#define FL_SYMLINK (1 << 2)
@@ -82,7 +77,6 @@ static int lstat_cache(const char *name, int len,
int match_flags, ret_flags, save_flags, max_len, ret;
struct stat st;
- total_calls++;
if (cache.track_flags != track_flags ||
cache.prefix_len_stat_func != prefix_len_stat_func) {
/*
@@ -94,17 +88,6 @@ static int lstat_cache(const char *name, int len,
cache.track_flags = track_flags;
cache.prefix_len_stat_func = prefix_len_stat_func;
match_len = last_slash = 0;
- cache_switches++;
- if (cache_switches > SWITCHES_BEFORE_WARNING) {
- if (number_of_warnings < 10 || number_of_warnings % 1000 == 0)
- printf("warning from %s:%d cache_switches:%u > %u "\
- "(current:%u last:%u total:%u)\n",
- __FILE__, __LINE__,
- cache_switches, SWITCHES_BEFORE_WARNING,
- current_cache_func, last_cache_func,
- total_calls);
- number_of_warnings++;
- }
} else {
/*
* Check to see if we have a match from the cache for
@@ -233,8 +216,6 @@ void clear_lstat_cache(void)
*/
int has_symlink_leading_path(const char *name, int len)
{
- last_cache_func = current_cache_func;
- current_cache_func = 1;
return lstat_cache(name, len,
FL_SYMLINK|FL_DIR, USE_ONLY_LSTAT) &
FL_SYMLINK;
@@ -246,8 +227,6 @@ int has_symlink_leading_path(const char *name, int len)
*/
int has_symlink_or_noent_leading_path(const char *name, int len)
{
- last_cache_func = current_cache_func;
- current_cache_func = 2;
return lstat_cache(name, len,
FL_SYMLINK|FL_NOENT|FL_DIR, USE_ONLY_LSTAT) &
(FL_SYMLINK|FL_NOENT);
@@ -262,8 +241,6 @@ int has_symlink_or_noent_leading_path(const char *name, int len)
*/
int has_dirs_only_path(const char *name, int len, int prefix_len)
{
- last_cache_func = current_cache_func;
- current_cache_func = 3;
return lstat_cache(name, len,
FL_DIR|FL_FULLPATH, prefix_len) &
FL_DIR;
--
1.6.2.GIT
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
