diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-26 00:03:30 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-11-26 00:03:30 +0000 |
| commit | eaa76a8dee2236d7f3f493ada113576d0e47f453 (patch) | |
| tree | c7be406c4f644834b7be5a1d8de338f04a979818 /ufs/hyper.c | |
| parent | 0fd99adfaf0255df26a540817e9eb09a456aeb45 (diff) | |
| parent | 393b762d63721cfb68e7efe54578370c18c7d0d3 (diff) | |
Merge branch 'upstream-merged'
Diffstat (limited to 'ufs/hyper.c')
| -rw-r--r-- | ufs/hyper.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ufs/hyper.c b/ufs/hyper.c index ece327a2..95013895 100644 --- a/ufs/hyper.c +++ b/ufs/hyper.c @@ -280,7 +280,7 @@ diskfs_set_hypermetadata (int wait, int clean) { error_t err; - spin_lock (&alloclock); + pthread_spin_lock (&alloclock); if (csum_dirty) { @@ -316,7 +316,7 @@ diskfs_set_hypermetadata (int wait, int clean) if (err) { - spin_unlock (&alloclock); + pthread_spin_unlock (&alloclock); return err; } @@ -337,7 +337,7 @@ diskfs_set_hypermetadata (int wait, int clean) wait = 1; /* must be synchronous */ } - spin_unlock (&alloclock); + pthread_spin_unlock (&alloclock); /* Update the superblock if necessary (clean bit was just set). */ copy_sblock (); @@ -355,7 +355,7 @@ copy_sblock () err = diskfs_catch_exception (); assert_perror (err); - spin_lock (&alloclock); + pthread_spin_lock (&alloclock); if (sblock_dirty) { @@ -386,7 +386,7 @@ copy_sblock () sblock_dirty = 0; } - spin_unlock (&alloclock); + pthread_spin_unlock (&alloclock); diskfs_end_catch_exception (); } |