imx: exit functions can/should be void

[safe/jmp/linux-2.6] / fs / gfs2 / ops_dentry.c

diff --git a/fs/gfs2/ops_dentry.c b/fs/gfs2/ops_dentry.c
index 5c61861..022c66c 100644 (file)
--- a/fs/gfs2/ops_dentry.c
+++ b/fs/gfs2/ops_dentry.c
@@ -1,24 +1,26 @@
 /*
  * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
+ * of the GNU General Public License version 2.
  */
 
-#include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
-#include <linux/smp_lock.h>
-#include <asm/semaphore.h>
+#include <linux/gfs2_ondisk.h>
+#include <linux/crc32.h>
 
 #include "gfs2.h"
+#include "incore.h"
 #include "dir.h"
 #include "glock.h"
-#include "ops_dentry.h"
+#include "super.h"
+#include "util.h"
+#include "inode.h"
 
 /**
  * gfs2_drevalidate - Check directory lookup consistency
@@ -34,28 +36,31 @@
 static int gfs2_drevalidate(struct dentry *dentry, struct nameidata *nd)
 {
        struct dentry *parent = dget_parent(dentry);
-       struct gfs2_inode *dip = get_v2ip(parent->d_inode);
-       struct gfs2_sbd *sdp = dip->i_sbd;
-       struct inode *inode;
+       struct gfs2_sbd *sdp = GFS2_SB(parent->d_inode);
+       struct gfs2_inode *dip = GFS2_I(parent->d_inode);
+       struct inode *inode = dentry->d_inode;
        struct gfs2_holder d_gh;
-       struct gfs2_inode *ip;
-       struct gfs2_inum inum;
-       unsigned int type;
+       struct gfs2_inode *ip = NULL;
        int error;
+       int had_lock = 0;
 
-       lock_kernel();
-
-       atomic_inc(&sdp->sd_ops_dentry);
+       if (inode) {
+               if (is_bad_inode(inode))
+                       goto invalid;
+               ip = GFS2_I(inode);
+       }
 
-       inode = dentry->d_inode;
-       if (inode && is_bad_inode(inode))
-               goto invalid;
+       if (sdp->sd_args.ar_localcaching)
+               goto valid;
 
-       error = gfs2_glock_nq_init(dip->i_gl, LM_ST_SHARED, 0, &d_gh);
-       if (error)
-               goto fail;
+       had_lock = (gfs2_glock_is_locked_by_me(dip->i_gl) != NULL);
+       if (!had_lock) {
+               error = gfs2_glock_nq_init(dip->i_gl, LM_ST_SHARED, 0, &d_gh);
+               if (error)
+                       goto fail;
+       } 
 
-       error = gfs2_dir_search(dip, &dentry->d_name, &inum, &type);
+       error = gfs2_dir_check(parent->d_inode, &dentry->d_name, ip);
        switch (error) {
        case 0:
                if (!inode)
@@ -69,49 +74,41 @@ static int gfs2_drevalidate(struct dentry *dentry, struct nameidata *nd)
                goto fail_gunlock;
        }
 
-       ip = get_v2ip(inode);
-
-       if (!gfs2_inum_equal(&ip->i_num, &inum))
-               goto invalid_gunlock;
-
-       if (IF2DT(ip->i_di.di_mode) != type) {
-               gfs2_consist_inode(dip);
-               goto fail_gunlock;
-       }
-
- valid_gunlock:
-       gfs2_glock_dq_uninit(&d_gh);
-
- valid:
-       unlock_kernel();
+valid_gunlock:
+       if (!had_lock)
+               gfs2_glock_dq_uninit(&d_gh);
+valid:
        dput(parent);
        return 1;
 
- invalid_gunlock:
-       gfs2_glock_dq_uninit(&d_gh);
-
- invalid:
+invalid_gunlock:
+       if (!had_lock)
+               gfs2_glock_dq_uninit(&d_gh);
+invalid:
        if (inode && S_ISDIR(inode->i_mode)) {
                if (have_submounts(dentry))
                        goto valid;
                shrink_dcache_parent(dentry);
        }
        d_drop(dentry);
-
-       unlock_kernel();
        dput(parent);
        return 0;
 
- fail_gunlock:
+fail_gunlock:
        gfs2_glock_dq_uninit(&d_gh);
-
- fail:
-       unlock_kernel();
+fail:
        dput(parent);
        return 0;
 }
 
-struct dentry_operations gfs2_dops = {
+static int gfs2_dhash(struct dentry *dentry, struct qstr *str)
+{
+       str->hash = gfs2_disk_hash(str->name, str->len);
+       return 0;
+}
+
+const struct dentry_operations gfs2_dops = {
        .d_revalidate = gfs2_drevalidate,
+       .d_hash = gfs2_dhash,
 };