aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/acl.h
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2008-10-10 20:02:48 -0400
committerTheodore Ts'o <tytso@mit.edu>2008-10-10 20:02:48 -0400
commit03010a3350301baac2154fa66de925ae2981b7e3 (patch)
treeb1af2cecbb540faab4bd67dc1a28ad3384341d72 /fs/ext4/acl.h
parent39d80c33a068d9fa63a36c3b2c0d718d38440dd1 (diff)
ext4: Rename ext4dev to ext4
The ext4 filesystem is getting stable enough that it's time to drop the "dev" prefix. Also remove the requirement for the TEST_FILESYS flag. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/acl.h')
-rw-r--r--fs/ext4/acl.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/acl.h b/fs/ext4/acl.h
index 4c9948f69f8b..cb45257a246e 100644
--- a/fs/ext4/acl.h
+++ b/fs/ext4/acl.h
@@ -51,7 +51,7 @@ static inline int ext4_acl_count(size_t size)
51 } 51 }
52} 52}
53 53
54#ifdef CONFIG_EXT4DEV_FS_POSIX_ACL 54#ifdef CONFIG_EXT4_FS_POSIX_ACL
55 55
56/* Value for inode->u.ext4_i.i_acl and inode->u.ext4_i.i_default_acl 56/* Value for inode->u.ext4_i.i_acl and inode->u.ext4_i.i_default_acl
57 if the ACL has not been cached */ 57 if the ACL has not been cached */
@@ -62,7 +62,7 @@ extern int ext4_permission(struct inode *, int);
62extern int ext4_acl_chmod(struct inode *); 62extern int ext4_acl_chmod(struct inode *);
63extern int ext4_init_acl(handle_t *, struct inode *, struct inode *); 63extern int ext4_init_acl(handle_t *, struct inode *, struct inode *);
64 64
65#else /* CONFIG_EXT4DEV_FS_POSIX_ACL */ 65#else /* CONFIG_EXT4_FS_POSIX_ACL */
66#include <linux/sched.h> 66#include <linux/sched.h>
67#define ext4_permission NULL 67#define ext4_permission NULL
68 68
@@ -77,5 +77,5 @@ ext4_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)
77{ 77{
78 return 0; 78 return 0;
79} 79}
80#endif /* CONFIG_EXT4DEV_FS_POSIX_ACL */ 80#endif /* CONFIG_EXT4_FS_POSIX_ACL */
81 81