3 files changed, 14 insertions, 31 deletions
diff --git a/cache.c b/cache.c
index 2e1ef8c..0ffa502 100644
--- a/cache.c
+++ b/cache.c
@@ -61,35 +61,26 @@ int cache_create_dirs()
 	return 1;
 }
 
-int cache_refill_overdue(const char *lockfile)
-{
-	struct stat st;
-
-	if (stat(lockfile, &st))
-		return 0;
-	else
-		return (time(NULL) - st.st_mtime > cgit_cache_max_create_time);
-}
-
 int cache_lock(struct cacheitem *item)
 {
-	int i = 0;
+	int ret;
 	char *lockfile = fmt("%s.lock", item->name);
 
- top:
-	if (++i > cgit_max_lock_attempts)
-		die("cache_lock: unable to lock %s: %s",
-		    item->name, strerror(errno));
-
-       	item->fd = open(lockfile, O_WRONLY|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR);
-
+ top:  
+       	item->fd = open(lockfile, O_WRONLY | O_CREAT | O_EXCL, S_IRUSR|S_IWUSR);
 	if (item->fd == NOLOCK && errno == ENOENT && cache_create_dirs())
 		goto top;
-
-	if (item->fd == NOLOCK && errno == EEXIST &&
-	    cache_refill_overdue(lockfile) && !unlink(lockfile))
+	if (item->fd == NOLOCK && errno == EEXIST) {
+		struct stat st;
+		time_t t;
+		if (stat(lockfile, &st))
+			return ret;
+		t = time(NULL);
+		if (t-st.st_mtime > cgit_cache_max_create_time && 
+		    !unlink(lockfile))
 			goto top;
-
+		return 0;
+	}
 	return (item->fd > 0);
 }
 
diff --git a/cgit.c b/cgit.c
index dc91125..7f14016 100644
--- a/cgit.c
+++ b/cgit.c
@@ -31,7 +31,6 @@ char *cgit_virtual_root = NULL;
 
 char *cgit_cache_root   = "/var/cache/cgit";
 
-int cgit_max_lock_attempts     =  5;
 int cgit_cache_root_ttl        =  5;
 int cgit_cache_repo_ttl        =  5;
 int cgit_cache_dynamic_ttl     =  5;
@@ -466,17 +465,11 @@ static void cgit_fill_cache(struct cacheitem *item)
 
 static void cgit_refresh_cache(struct cacheitem *item)
 {
-	int i = 0;
-
 	cache_prepare(item);
  top:
-	if (++i > cgit_max_lock_attempts) {
-		die("cgit_refresh_cache: unable to lock %s: %s",
-		    item->name, strerror(errno));
-	}
 	if (!cache_exist(item)) {
 		if (!cache_lock(item)) {
-			sleep(1);
+			sched_yield();
 			goto top;
 		}
 		if (!cache_exist(item))
diff --git a/cgit.h b/cgit.h
index 7e4bfef..3b0994a 100644
--- a/cgit.h
+++ b/cgit.h
@@ -23,7 +23,6 @@ extern char *cgit_logo_link;
 extern char *cgit_virtual_root;
 extern char *cgit_cache_root;
 
-extern int cgit_max_lock_attempts;
 extern int cgit_cache_root_ttl;
 extern int cgit_cache_repo_ttl;
 extern int cgit_cache_dynamic_ttl;