From fe232371db049d3bd990f78474f2381057c50be3 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 11 Feb 2013 23:34:42 +0000
Subject: Fix build against libpthread

* Makefile (netio): Link against libpthread instead of libthreads.
* netfs.c: Use libpthread functions instead of libthreads functions.
---
 Makefile |  2 +-
 netfs.c  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 01d6fdc39..6aa013b94 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ CFLAGS = -g -Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
 INSTALL = install
 
 netio: main.o netfs.o node.o lib.o protocol.o
-	gcc $(CFLAGS) -lnetfs -lfshelp -liohelp -lthreads -lports \
+	gcc $(CFLAGS) -lnetfs -lfshelp -liohelp -lpthread -lports \
 	  -lihash -lshouldbeinlibc \
           -o netio main.o netfs.o node.o lib.o protocol.o
 
diff --git a/netfs.c b/netfs.c
index e4adf8e0f..7e71fddc7 100644
--- a/netfs.c
+++ b/netfs.c
@@ -89,11 +89,11 @@ netfs_attempt_lookup (struct iouser *user, struct node *dir,
 
  out:
   fshelp_touch (&dir->nn_stat, TOUCH_ATIME, netio_maptime);
-  mutex_unlock (&dir->lock);
+  pthread_mutex_unlock (&dir->lock);
   if (err)
     *node = 0;
   else
-    mutex_lock (&(*node)->lock);
+    pthread_mutex_lock (&(*node)->lock);
   return err;
 }
 
@@ -335,7 +335,7 @@ netfs_attempt_create_file (struct iouser *user, struct node *dir,
 			   char *name, mode_t mode, struct node **np)
 {
   *np = 0;
-  mutex_unlock (&dir->lock);
+  pthread_mutex_unlock (&dir->lock);
   return EOPNOTSUPP;
 }
 
@@ -628,11 +628,11 @@ netfs_S_io_read (struct protid *user,
 	return err;
     }
 
-  mutex_lock (&user->po->np->lock);
+  pthread_mutex_lock (&user->po->np->lock);
 
   if ((user->po->openstat & O_READ) == 0)
     {
-      mutex_unlock (&node->lock);
+      pthread_mutex_unlock (&node->lock);
       return EBADF;
     }
 
@@ -680,7 +680,7 @@ netfs_S_io_read (struct protid *user,
   if (offset == -1 && !err)
     user->po->filepointer += *datalen;
 
-  mutex_unlock (&node->lock);
+  pthread_mutex_unlock (&node->lock);
 
   if (err && alloced)
     munmap (*data, amount);
-- 
cgit v1.2.3