summaryrefslogtreecommitdiff
path: root/cache.c
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2013-07-08 11:12:30 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2013-07-08 11:12:30 +0200
commit7a05d6fac03cd1d96ef219ad64cb2a61c8300c47 (patch)
treeed8a36e984ffb3683a2428e345c774481dd34ba8 /cache.c
parente559567111b9b5dd46cf5e3278e71cc0b2423cfa (diff)
parent09a547f9155e54fd34c4fab20ff98d906cedb2c2 (diff)
Merge remote-tracking branch 'origin/tarfs/master' into tarfs
Diffstat (limited to 'cache.c')
-rw-r--r--cache.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cache.c b/cache.c
index 685e0ea04..fefc36857 100644
--- a/cache.c
+++ b/cache.c
@@ -32,8 +32,8 @@
#include "debug.h"
/* Locking/unlocking a node's cache */
-#define LOCK(Node) mutex_lock (&CACHE_INFO ((Node), lock))
-#define UNLOCK(Node) mutex_unlock (&CACHE_INFO ((Node), lock));
+#define LOCK(Node) pthread_mutex_lock (&CACHE_INFO ((Node), lock))
+#define UNLOCK(Node) pthread_mutex_unlock (&CACHE_INFO ((Node), lock));
/* Tar file callback (in tarfs.c). */
static error_t (* read_file) (struct node *node,
@@ -76,7 +76,7 @@ cache_create (struct node *node)
CACHE_INFO (node, size) = blocks;
debug (("Node %s: Initial block vector size: %u", node->nn->name, blocks));
- mutex_init (&CACHE_INFO (node, lock));
+ pthread_mutex_init (&CACHE_INFO (node, lock), NULL);
return 0;
}