nfsd: move most of nfsfh.h to fs/nfsd

[safe/jmp/linux-2.6] / fs / 9p / vfs_dentry.c

diff --git a/fs/9p/vfs_dentry.c b/fs/9p/vfs_dentry.c
index 306c967..d743252 100644 (file)
--- a/fs/9p/vfs_dentry.c
+++ b/fs/9p/vfs_dentry.c
@@ -7,9 +7,8 @@
  *  Copyright (C) 2002 by Ron Minnich <rminnich@lanl.gov>
  *
  *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
+ *  it under the terms of the GNU General Public License version 2
+ *  as published by the Free Software Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,59 +30,52 @@
 #include <linux/pagemap.h>
 #include <linux/stat.h>
 #include <linux/string.h>
-#include <linux/smp_lock.h>
 #include <linux/inet.h>
 #include <linux/namei.h>
 #include <linux/idr.h>
+#include <linux/sched.h>
+#include <net/9p/9p.h>
+#include <net/9p/client.h>
 
-#include "debug.h"
 #include "v9fs.h"
-#include "9p.h"
 #include "v9fs_vfs.h"
-#include "conv.h"
 #include "fid.h"
 
 /**
- * v9fs_dentry_validate - VFS dcache hook to validate cache
- * @dentry:  dentry that is being validated
- * @nd: path data
+ * v9fs_dentry_delete - called when dentry refcount equals 0
+ * @dentry:  dentry in question
  *
- * dcache really shouldn't be used for 9P2000 as at all due to
- * potential attached semantics to directory traversal (walk).
- *
- * FUTURE: look into how to use dcache to allow multi-stage
- * walks in Plan 9 & potential for better dcache operation which
- * would remain valid for Plan 9 semantics.  Older versions
- * had validation via stat for those interested.  However, since
- * stat has the same approximate overhead as walk there really
- * is no difference.  The only improvement would be from a
- * time-decay cache like NFS has and that undermines the
- * synchronous nature of 9P2000.
+ * By returning 1 here we should remove cacheing of unused
+ * dentry components.
  *
  */
 
-static int v9fs_dentry_validate(struct dentry *dentry, struct nameidata *nd)
+static int v9fs_dentry_delete(struct dentry *dentry)
 {
-       struct dentry *dc = current->fs->pwd;
+       P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_name.name,
+                                                                       dentry);
 
-       dprintk(DEBUG_VFS, "dentry: %s (%p)\n", dentry->d_iname, dentry);
-       if (v9fs_fid_lookup(dentry, FID_OP)) {
-               dprintk(DEBUG_VFS, "VALID\n");
-               return 1;
-       }
+       return 1;
+}
 
-       while (dc != NULL) {
-               if (dc == dentry) {
-                       dprintk(DEBUG_VFS, "VALID\n");
-                       return 1;
-               }
-               if (dc == dc->d_parent)
-                       break;
+/**
+ * v9fs_cached_dentry_delete - called when dentry refcount equals 0
+ * @dentry:  dentry in question
+ *
+ * Only return 1 if our inode is invalid.  Only non-synthetic files
+ * (ones without mtime == 0) should be calling this function.
+ *
+ */
 
-               dc = dc->d_parent;
-       }
+static int v9fs_cached_dentry_delete(struct dentry *dentry)
+{
+       struct inode *inode = dentry->d_inode;
+       P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_name.name,
+                                                                       dentry);
+
+       if(!inode)
+               return 1;
 
-       dprintk(DEBUG_VFS, "INVALID\n");
        return 0;
 }
 
@@ -95,32 +87,29 @@ static int v9fs_dentry_validate(struct dentry *dentry, struct nameidata *nd)
 
 void v9fs_dentry_release(struct dentry *dentry)
 {
-       dprintk(DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_iname, dentry);
-
-       if (dentry->d_fsdata != NULL) {
-               struct list_head *fid_list = dentry->d_fsdata;
-               struct v9fs_fid *temp = NULL;
-               struct v9fs_fid *current_fid = NULL;
-               struct v9fs_fcall *fcall = NULL;
-
-               list_for_each_entry_safe(current_fid, temp, fid_list, list) {
-                       if (v9fs_t_clunk
-                           (current_fid->v9ses, current_fid->fid, &fcall))
-                               dprintk(DEBUG_ERROR, "clunk failed: %s\n",
-                                       FCALL_ERROR(fcall));
-
-                       v9fs_put_idpool(current_fid->fid,
-                                       &current_fid->v9ses->fidpool);
-
-                       kfree(fcall);
-                       v9fs_fid_destroy(current_fid);
+       struct v9fs_dentry *dent;
+       struct p9_fid *temp, *current_fid;
+
+       P9_DPRINTK(P9_DEBUG_VFS, " dentry: %s (%p)\n", dentry->d_name.name,
+                                                                       dentry);
+       dent = dentry->d_fsdata;
+       if (dent) {
+               list_for_each_entry_safe(current_fid, temp, &dent->fidlist,
+                                                                       dlist) {
+                       p9_client_clunk(current_fid);
                }
 
-               kfree(dentry->d_fsdata);        /* free the list_head */
+               kfree(dent);
+               dentry->d_fsdata = NULL;
        }
 }
 
-struct dentry_operations v9fs_dentry_operations = {
-       .d_revalidate = v9fs_dentry_validate,
+const struct dentry_operations v9fs_cached_dentry_operations = {
+       .d_delete = v9fs_cached_dentry_delete,
+       .d_release = v9fs_dentry_release,
+};
+
+const struct dentry_operations v9fs_dentry_operations = {
+       .d_delete = v9fs_dentry_delete,
        .d_release = v9fs_dentry_release,
 };