diff options
Diffstat (limited to 'fs/gfs2/ops_dentry.c')
-rw-r--r-- | fs/gfs2/ops_dentry.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/gfs2/ops_dentry.c b/fs/gfs2/ops_dentry.c index b020ad8f180b..7f6139288519 100644 --- a/fs/gfs2/ops_dentry.c +++ b/fs/gfs2/ops_dentry.c | |||
@@ -13,12 +13,16 @@ | |||
13 | #include <linux/completion.h> | 13 | #include <linux/completion.h> |
14 | #include <linux/buffer_head.h> | 14 | #include <linux/buffer_head.h> |
15 | #include <linux/smp_lock.h> | 15 | #include <linux/smp_lock.h> |
16 | #include <linux/gfs2_ondisk.h> | ||
16 | #include <asm/semaphore.h> | 17 | #include <asm/semaphore.h> |
17 | 18 | ||
18 | #include "gfs2.h" | 19 | #include "gfs2.h" |
20 | #include "lm_interface.h" | ||
21 | #include "incore.h" | ||
19 | #include "dir.h" | 22 | #include "dir.h" |
20 | #include "glock.h" | 23 | #include "glock.h" |
21 | #include "ops_dentry.h" | 24 | #include "ops_dentry.h" |
25 | #include "util.h" | ||
22 | 26 | ||
23 | /** | 27 | /** |
24 | * gfs2_drevalidate - Check directory lookup consistency | 28 | * gfs2_drevalidate - Check directory lookup consistency |
@@ -34,7 +38,7 @@ | |||
34 | static int gfs2_drevalidate(struct dentry *dentry, struct nameidata *nd) | 38 | static int gfs2_drevalidate(struct dentry *dentry, struct nameidata *nd) |
35 | { | 39 | { |
36 | struct dentry *parent = dget_parent(dentry); | 40 | struct dentry *parent = dget_parent(dentry); |
37 | struct gfs2_inode *dip = get_v2ip(parent->d_inode); | 41 | struct gfs2_inode *dip = parent->d_inode->u.generic_ip; |
38 | struct inode *inode; | 42 | struct inode *inode; |
39 | struct gfs2_holder d_gh; | 43 | struct gfs2_holder d_gh; |
40 | struct gfs2_inode *ip; | 44 | struct gfs2_inode *ip; |
@@ -66,7 +70,7 @@ static int gfs2_drevalidate(struct dentry *dentry, struct nameidata *nd) | |||
66 | goto fail_gunlock; | 70 | goto fail_gunlock; |
67 | } | 71 | } |
68 | 72 | ||
69 | ip = get_v2ip(inode); | 73 | ip = inode->u.generic_ip; |
70 | 74 | ||
71 | if (!gfs2_inum_equal(&ip->i_num, &inum)) | 75 | if (!gfs2_inum_equal(&ip->i_num, &inum)) |
72 | goto invalid_gunlock; | 76 | goto invalid_gunlock; |