summaryrefslogtreecommitdiff
path: root/netfs.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 /netfs.c
parente559567111b9b5dd46cf5e3278e71cc0b2423cfa (diff)
parent09a547f9155e54fd34c4fab20ff98d906cedb2c2 (diff)
Merge remote-tracking branch 'origin/tarfs/master' into tarfs
Diffstat (limited to 'netfs.c')
-rw-r--r--netfs.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/netfs.c b/netfs.c
index 77e53dc85..1b006a3fc 100644
--- a/netfs.c
+++ b/netfs.c
@@ -77,13 +77,13 @@ netfs_attempt_lookup (struct iouser *user, struct node *dir,
if (!err && *np)
{
if (*np != dir)
- mutex_lock (&(*np)->lock);
+ pthread_mutex_lock (&(*np)->lock);
debug (("Node %s: %i references", name, (*np)->references));
netfs_nref (*np);
}
- mutex_unlock (&dir->lock);
+ pthread_mutex_unlock (&dir->lock);
return err;
}
@@ -640,7 +640,7 @@ netfs_attempt_unlink (struct iouser *user, struct node *dir,
if (!err)
{
- mutex_lock (&node->lock);
+ pthread_mutex_lock (&node->lock);
debug (("Node %s: %i references", name, node->references));
err = fshelp_isowner (&node->nn_stat, user);
@@ -648,7 +648,7 @@ netfs_attempt_unlink (struct iouser *user, struct node *dir,
if (!err)
err = backend.unlink_node (node);
- mutex_unlock (&node->lock);
+ pthread_mutex_unlock (&node->lock);
}
}
else
@@ -758,12 +758,12 @@ netfs_attempt_create_file (struct iouser *user, struct node *dir,
if (!err && *np)
{
debug (("Node %s: %i references", name, (*np)->references));
- mutex_lock (&(*np)->lock);
+ pthread_mutex_lock (&(*np)->lock);
netfs_nref (*np);
}
}
- mutex_unlock (&dir->lock);
+ pthread_mutex_unlock (&dir->lock);
return err;
}