Merge branch 'master' into gfs2

[pandora-kernel.git] / fs / lockd / svcsubs.c

diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
index 62f4a38..a92dd98 100644 (file)
--- a/fs/lockd/svcsubs.c
+++ b/fs/lockd/svcsubs.c
@@ -6,11 +6,11 @@
  * Copyright (C) 1996, Olaf Kirch <okir@monad.swb.de>
  */
 
-#include <linux/config.h>
 #include <linux/types.h>
 #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 +28,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 +91,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))
@@ -100,11 +100,10 @@ nlm_lookup_file(struct svc_rqst *rqstp, struct nlm_file **result,
        nlm_debug_print_fh("creating file for", f);
 
        nfserr = nlm_lck_denied_nolocks;
-       file = (struct nlm_file *) kmalloc(sizeof(*file), GFP_KERNEL);
+       file = kzalloc(sizeof(*file), GFP_KERNEL);
        if (!file)
                goto out_unlock;
 
-       memset(file, 0, sizeof(*file));
        memcpy(&file->f_handle, f, sizeof(struct nfs_fh));
        file->f_hash = hash;
        init_MUTEX(&file->f_sema);
@@ -130,7 +129,7 @@ found:
        nfserr = 0;
 
 out_unlock:
-       up(&nlm_file_sema);
+       mutex_unlock(&nlm_file_mutex);
        return nfserr;
 
 out_free:
@@ -182,7 +181,7 @@ nlm_traverse_locks(struct nlm_host *host, struct nlm_file *file, int action)
 again:
        file->f_locks = 0;
        for (fl = inode->i_flock; fl; fl = fl->fl_next) {
-               if (!(fl->fl_flags & FL_LOCKD))
+               if (fl->fl_lmops != &nlmsvc_lock_operations)
                        continue;
 
                /* update current lock count */
@@ -224,9 +223,8 @@ nlm_inspect_file(struct nlm_host *host, struct nlm_file *file, int action)
                if (file->f_count || file->f_blocks || file->f_shares)
                        return 1;
        } else {
-               if (nlmsvc_traverse_blocks(host, file, action)
-                || nlmsvc_traverse_shares(host, file, action))
-                       return 1;
+               nlmsvc_traverse_blocks(host, file, action);
+               nlmsvc_traverse_shares(host, file, action);
        }
        return nlm_traverse_locks(host, file, action);
 }
@@ -238,19 +236,22 @@ static int
 nlm_traverse_files(struct nlm_host *host, int action)
 {
        struct nlm_file *file, **fp;
-       int             i;
+       int i, ret = 0;
 
-       down(&nlm_file_sema);
+       mutex_lock(&nlm_file_mutex);
        for (i = 0; i < FILE_NRHASH; i++) {
                fp = nlm_files + i;
                while ((file = *fp) != NULL) {
+                       file->f_count++;
+                       mutex_unlock(&nlm_file_mutex);
+
                        /* 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);
-                               return 1;
-                       }
+                       if (nlm_inspect_file(host, file, action))
+                               ret = 1;
 
+                       mutex_lock(&nlm_file_mutex);
+                       file->f_count--;
                        /* No more references to this file. Let go of it. */
                        if (!file->f_blocks && !file->f_locks
                         && !file->f_shares && !file->f_count) {
@@ -262,8 +263,8 @@ nlm_traverse_files(struct nlm_host *host, int action)
                        }
                }
        }
-       up(&nlm_file_sema);
-       return 0;
+       mutex_unlock(&nlm_file_mutex);
+       return ret;
 }
 
 /*
@@ -282,7 +283,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) {
@@ -290,7 +291,7 @@ nlm_release_file(struct nlm_file *file)
                        nlm_delete_file(file);
        }
 
-       up(&nlm_file_sema);
+       mutex_unlock(&nlm_file_mutex);
 }
 
 /*