diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-27 23:23:27 +0100 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-27 23:23:27 +0100 |
| commit | 5c676f6d359b0404d53f542f02e1359583cb2895 (patch) | |
| tree | 8741011990ec0a3d0d41fee9f0d7abf6a16834cc /fs/gfs2/ops_dentry.c | |
| parent | Merge branch 'master' (diff) | |
| download | linux-5c676f6d359b0404d53f542f02e1359583cb2895.tar.xz linux-5c676f6d359b0404d53f542f02e1359583cb2895.zip | |
[GFS2] Macros removal in gfs2.h
As suggested by Pekka Enberg <penberg@cs.helsinki.fi>.
The DIV_RU macro is renamed DIV_ROUND_UP and and moved to kernel.h
The other macros are gone from gfs2.h as (although not requested
by Pekka Enberg) are a number of included header file which are now
included individually. The inode number comparison function is
now an inline function.
The DT2IF and IF2DT may be addressed in a future patch.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
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 @@ #include <linux/completion.h> #include <linux/buffer_head.h> #include <linux/smp_lock.h> +#include <linux/gfs2_ondisk.h> #include <asm/semaphore.h> #include "gfs2.h" +#include "lm_interface.h" +#include "incore.h" #include "dir.h" #include "glock.h" #include "ops_dentry.h" +#include "util.h" /** * gfs2_drevalidate - Check directory lookup consistency @@ -34,7 +38,7 @@ 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_inode *dip = parent->d_inode->u.generic_ip; struct inode *inode; struct gfs2_holder d_gh; struct gfs2_inode *ip; @@ -66,7 +70,7 @@ static int gfs2_drevalidate(struct dentry *dentry, struct nameidata *nd) goto fail_gunlock; } - ip = get_v2ip(inode); + ip = inode->u.generic_ip; if (!gfs2_inum_equal(&ip->i_num, &inum)) goto invalid_gunlock; |