git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
fs
/
ext2
/
acl.h
diff --git
a/fs/ext2/acl.h
b/fs/ext2/acl.h
index
b0a1c4b
..
0bde85b
100644
(file)
--- a/
fs/ext2/acl.h
+++ b/
fs/ext2/acl.h
@@
-4,10
+4,9
@@
(C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org>
*/
(C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org>
*/
-#include <linux/
xattr_acl
.h>
+#include <linux/
posix_acl_xattr
.h>
#define EXT2_ACL_VERSION 0x0001
#define EXT2_ACL_VERSION 0x0001
-#define EXT2_ACL_MAX_ENTRIES 32
typedef struct {
__le16 e_tag;
typedef struct {
__le16 e_tag;
@@
-63,9
+62,6
@@
extern int ext2_permission (struct inode *, int, struct nameidata *);
extern int ext2_acl_chmod (struct inode *);
extern int ext2_init_acl (struct inode *, struct inode *);
extern int ext2_acl_chmod (struct inode *);
extern int ext2_init_acl (struct inode *, struct inode *);
-extern int init_ext2_acl(void);
-extern void exit_ext2_acl(void);
-
#else
#include <linux/sched.h>
#define ext2_permission NULL
#else
#include <linux/sched.h>
#define ext2_permission NULL
@@
-80,7
+76,6
@@
ext2_acl_chmod (struct inode *inode)
static inline int ext2_init_acl (struct inode *inode, struct inode *dir)
{
static inline int ext2_init_acl (struct inode *inode, struct inode *dir)
{
- inode->i_mode &= ~current->fs->umask;
return 0;
}
#endif
return 0;
}
#endif