diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-27 17:23:27 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-27 17:23:27 -0500 |
| commit | 5c676f6d359b0404d53f542f02e1359583cb2895 (patch) | |
| tree | 8741011990ec0a3d0d41fee9f0d7abf6a16834cc /fs/gfs2/acl.c | |
| parent | f3b270a47882b958e9e3c5bd86894e3a7072899a (diff) | |
| download | kernel_samsung_smdk4412-5c676f6d359b0404d53f542f02e1359583cb2895.zip kernel_samsung_smdk4412-5c676f6d359b0404d53f542f02e1359583cb2895.tar.gz kernel_samsung_smdk4412-5c676f6d359b0404d53f542f02e1359583cb2895.tar.bz2 | |
[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/acl.c')
| -rw-r--r-- | fs/gfs2/acl.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c index 9482a67..e9d05fe 100644 --- a/fs/gfs2/acl.c +++ b/fs/gfs2/acl.c @@ -15,8 +15,11 @@ #include <linux/posix_acl.h> #include <linux/posix_acl_xattr.h> #include <asm/semaphore.h> +#include <linux/gfs2_ondisk.h> #include "gfs2.h" +#include "lm_interface.h" +#include "incore.h" #include "acl.h" #include "eaops.h" #include "eattr.h" @@ -24,6 +27,7 @@ #include "inode.h" #include "meta_io.h" #include "trans.h" +#include "util.h" #define ACL_ACCESS 1 #define ACL_DEFAULT 0 @@ -157,7 +161,7 @@ int gfs2_check_acl_locked(struct inode *inode, int mask) struct posix_acl *acl = NULL; int error; - error = acl_get(get_v2ip(inode), ACL_ACCESS, &acl, NULL, NULL, NULL); + error = acl_get(inode->u.generic_ip, ACL_ACCESS, &acl, NULL, NULL, NULL); if (error) return error; @@ -172,7 +176,7 @@ int gfs2_check_acl_locked(struct inode *inode, int mask) int gfs2_check_acl(struct inode *inode, int mask) { - struct gfs2_inode *ip = get_v2ip(inode); + struct gfs2_inode *ip = inode->u.generic_ip; struct gfs2_holder i_gh; int error; |