Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

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

diff --git a/fs/gfs2/ops_dentry.c b/fs/gfs2/ops_dentry.c
index a1ba1ec8eef45d4c03d76d987a6a2c41d3a514ef..00041b1b802522254a8cb8689f4a67d245101808 100644 (file)
--- a/fs/gfs2/ops_dentry.c
+++ b/fs/gfs2/ops_dentry.c
@@ -15,9 +15,9 @@
 #include <linux/smp_lock.h>
 #include <linux/gfs2_ondisk.h>
 #include <linux/crc32.h>
+#include <linux/lm_interface.h>
 
 #include "gfs2.h"
-#include "lm_interface.h"
 #include "incore.h"
 #include "dir.h"
 #include "glock.h"
@@ -81,31 +81,27 @@ static int gfs2_drevalidate(struct dentry *dentry, struct nameidata *nd)
                goto fail_gunlock;
        }
 
- valid_gunlock:
+valid_gunlock:
        gfs2_glock_dq_uninit(&d_gh);
-
- valid:
+valid:
        dput(parent);
        return 1;
 
- invalid_gunlock:
+invalid_gunlock:
        gfs2_glock_dq_uninit(&d_gh);
-
- invalid:
+invalid:
        if (inode && S_ISDIR(inode->i_mode)) {
                if (have_submounts(dentry))
                        goto valid;
                shrink_dcache_parent(dentry);
        }
        d_drop(dentry);
-
        dput(parent);
        return 0;
 
- fail_gunlock:
+fail_gunlock:
        gfs2_glock_dq_uninit(&d_gh);
-
- fail:
+fail:
        dput(parent);
        return 0;
 }