summaryrefslogtreecommitdiffstats
path: root/fs/ext4/acl.h
diff options
context:
space:
mode:
authorMingming Cao <cmm@us.ibm.com>2006-10-11 01:20:53 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-11 11:14:15 -0700
commit617ba13b31fbf505cc21799826639ef24ed94af0 (patch)
tree2a41e8c993f7c1eed115ad24047d546ba56cbdf5 /fs/ext4/acl.h
parentac27a0ec112a089f1a5102bc8dffc79c8c815571 (diff)
downloadop-kernel-dev-617ba13b31fbf505cc21799826639ef24ed94af0.zip
op-kernel-dev-617ba13b31fbf505cc21799826639ef24ed94af0.tar.gz
[PATCH] ext4: rename ext4 symbols to avoid duplication of ext3 symbols
Mingming Cao originally did this work, and Shaggy reproduced it using some scripts from her. Signed-off-by: Mingming Cao <cmm@us.ibm.com> Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/ext4/acl.h')
-rw-r--r--fs/ext4/acl.h58
1 files changed, 29 insertions, 29 deletions
diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h
index 0d1e627..26a5c1a 100644
--- a/fs/ext4/acl.h
+++ b/fs/ext4/acl.h
@@ -1,81 +1,81 @@
/*
- File: fs/ext3/acl.h
+ File: fs/ext4/acl.h
(C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org>
*/
#include <linux/posix_acl_xattr.h>
-#define EXT3_ACL_VERSION 0x0001
+#define EXT4_ACL_VERSION 0x0001
typedef struct {
__le16 e_tag;
__le16 e_perm;
__le32 e_id;
-} ext3_acl_entry;
+} ext4_acl_entry;
typedef struct {
__le16 e_tag;
__le16 e_perm;
-} ext3_acl_entry_short;
+} ext4_acl_entry_short;
typedef struct {
__le32 a_version;
-} ext3_acl_header;
+} ext4_acl_header;
-static inline size_t ext3_acl_size(int count)
+static inline size_t ext4_acl_size(int count)
{
if (count <= 4) {
- return sizeof(ext3_acl_header) +
- count * sizeof(ext3_acl_entry_short);
+ return sizeof(ext4_acl_header) +
+ count * sizeof(ext4_acl_entry_short);
} else {
- return sizeof(ext3_acl_header) +
- 4 * sizeof(ext3_acl_entry_short) +
- (count - 4) * sizeof(ext3_acl_entry);
+ return sizeof(ext4_acl_header) +
+ 4 * sizeof(ext4_acl_entry_short) +
+ (count - 4) * sizeof(ext4_acl_entry);
}
}
-static inline int ext3_acl_count(size_t size)
+static inline int ext4_acl_count(size_t size)
{
ssize_t s;
- size -= sizeof(ext3_acl_header);
- s = size - 4 * sizeof(ext3_acl_entry_short);
+ size -= sizeof(ext4_acl_header);
+ s = size - 4 * sizeof(ext4_acl_entry_short);
if (s < 0) {
- if (size % sizeof(ext3_acl_entry_short))
+ if (size % sizeof(ext4_acl_entry_short))
return -1;
- return size / sizeof(ext3_acl_entry_short);
+ return size / sizeof(ext4_acl_entry_short);
} else {
- if (s % sizeof(ext3_acl_entry))
+ if (s % sizeof(ext4_acl_entry))
return -1;
- return s / sizeof(ext3_acl_entry) + 4;
+ return s / sizeof(ext4_acl_entry) + 4;
}
}
-#ifdef CONFIG_EXT3_FS_POSIX_ACL
+#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL
-/* Value for inode->u.ext3_i.i_acl and inode->u.ext3_i.i_default_acl
+/* Value for inode->u.ext4_i.i_acl and inode->u.ext4_i.i_default_acl
if the ACL has not been cached */
-#define EXT3_ACL_NOT_CACHED ((void *)-1)
+#define EXT4_ACL_NOT_CACHED ((void *)-1)
/* acl.c */
-extern int ext3_permission (struct inode *, int, struct nameidata *);
-extern int ext3_acl_chmod (struct inode *);
-extern int ext3_init_acl (handle_t *, struct inode *, struct inode *);
+extern int ext4_permission (struct inode *, int, struct nameidata *);
+extern int ext4_acl_chmod (struct inode *);
+extern int ext4_init_acl (handle_t *, struct inode *, struct inode *);
-#else /* CONFIG_EXT3_FS_POSIX_ACL */
+#else /* CONFIG_EXT4DEV_FS_POSIX_ACL */
#include <linux/sched.h>
-#define ext3_permission NULL
+#define ext4_permission NULL
static inline int
-ext3_acl_chmod(struct inode *inode)
+ext4_acl_chmod(struct inode *inode)
{
return 0;
}
static inline int
-ext3_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)
+ext4_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)
{
return 0;
}
-#endif /* CONFIG_EXT3_FS_POSIX_ACL */
+#endif /* CONFIG_EXT4DEV_FS_POSIX_ACL */
OpenPOWER on IntegriCloud