1 files changed, 9 insertions, 8 deletions

diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
index c7a6e3ae44d6..a570e5c8a930 100644
--- a/fs/lockd/svcsubs.c
+++ b/fs/lockd/svcsubs.c
@@ -11,6 +11,7 @@
 #include <linux/string.h>
 #include <linux/time.h>
 #include <linux/in.h>
+#include <linux/mutex.h>
 #include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/clnt.h>
 #include <linux/nfsd/nfsfh.h>
@@ -28,7 +29,7 @@
 #define FILE_HASH_BITS          5
 #define FILE_NRHASH             (1<<FILE_HASH_BITS)
 static struct nlm_file *        nlm_files[FILE_NRHASH];
-static DECLARE_MUTEX(nlm_file_sema);
+static DEFINE_MUTEX(nlm_file_mutex);
 
 #ifdef NFSD_DEBUG
 static inline void nlm_debug_print_fh(char *msg, struct nfs_fh *f)
@@ -91,7 +92,7 @@ nlm_lookup_file(struct svc_rqst *rqstp, struct nlm_file **result,
         hash = file_hash(f);
 
         /* Lock file table */
-        down(&nlm_file_sema);
+        mutex_lock(&nlm_file_mutex);
 
         for (file = nlm_files[hash]; file; file = file->f_next)
                 if (!nfs_compare_fh(&file->f_handle, f))
@@ -130,7 +131,7 @@ found:
         nfserr = 0;
 
 out_unlock:
-        up(&nlm_file_sema);
+        mutex_unlock(&nlm_file_mutex);
         return nfserr;
 
 out_free:
@@ -239,14 +240,14 @@ nlm_traverse_files(struct nlm_host *host, int action)
         struct nlm_file *file, **fp;
         int             i;
 
-        down(&nlm_file_sema);
+        mutex_lock(&nlm_file_mutex);
         for (i = 0; i < FILE_NRHASH; i++) {
                 fp = nlm_files + i;
                 while ((file = *fp) != NULL) {
                         /* Traverse locks, blocks and shares of this file
                          * and update file->f_locks count */
                         if (nlm_inspect_file(host, file, action)) {
-                                up(&nlm_file_sema);
+                                mutex_unlock(&nlm_file_mutex);
                                 return 1;
                         }
 
@@ -261,7 +262,7 @@ nlm_traverse_files(struct nlm_host *host, int action)
                         }
                 }
         }
-        up(&nlm_file_sema);
+        mutex_unlock(&nlm_file_mutex);
         return 0;
 }
 
@@ -281,7 +282,7 @@ nlm_release_file(struct nlm_file *file)
                                 file, file->f_count);
 
         /* Lock file table */
-        down(&nlm_file_sema);
+        mutex_lock(&nlm_file_mutex);
 
         /* If there are no more locks etc, delete the file */
         if(--file->f_count == 0) {
@@ -289,7 +290,7 @@ nlm_release_file(struct nlm_file *file)
                         nlm_delete_file(file);
         }
 
-        up(&nlm_file_sema);
+        mutex_unlock(&nlm_file_mutex);
 }
 
 /*