X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fgfs2%2Fops_dentry.c;h=d355899585d822b800d15f2d8826734bc2d02a6f;hb=2b2842146cb4105877c2be51d3857ec61ebd4ff9;hp=fd55979ec428106e2da3d2ff0f1db6ff46edfb73;hpb=71ec63c5d66b577a71910b82740751be73e81310;p=linux-2.6

diff --git a/fs/gfs2/ops_dentry.c b/fs/gfs2/ops_dentry.c
index fd55979ec4..d355899585 100644
--- a/fs/gfs2/ops_dentry.c
+++ b/fs/gfs2/ops_dentry.c
@@ -4,7 +4,7 @@
  *
  * 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>
@@ -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"
@@ -43,7 +43,7 @@ static int gfs2_drevalidate(struct dentry *dentry, struct nameidata *nd)
 	struct inode *inode = dentry->d_inode;
 	struct gfs2_holder d_gh;
 	struct gfs2_inode *ip;
-	struct gfs2_inum inum;
+	struct gfs2_inum_host inum;
 	unsigned int type;
 	int error;
 
@@ -76,36 +76,32 @@ static int gfs2_drevalidate(struct dentry *dentry, struct nameidata *nd)
 	if (!gfs2_inum_equal(&ip->i_num, &inum))
 		goto invalid_gunlock;
 
-	if (IF2DT(ip->i_di.di_mode) != type) {
+	if (IF2DT(ip->i_inode.i_mode) != type) {
 		gfs2_consist_inode(dip);
 		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;
 }