aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/fs.h3
-rw-r--r--include/linux/reiserfs_xattr.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 8c84ed930389..0c15d5e459d5 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2187,8 +2187,7 @@ extern sector_t bmap(struct inode *, sector_t);
2187#endif 2187#endif
2188extern int notify_change(struct dentry *, struct iattr *); 2188extern int notify_change(struct dentry *, struct iattr *);
2189extern int inode_permission(struct inode *, int); 2189extern int inode_permission(struct inode *, int);
2190extern int generic_permission(struct inode *, int, unsigned int, 2190extern int generic_permission(struct inode *, int, unsigned int);
2191 int (*check_acl)(struct inode *, int, unsigned int));
2192 2191
2193static inline bool execute_ok(struct inode *inode) 2192static inline bool execute_ok(struct inode *inode)
2194{ 2193{
diff --git a/include/linux/reiserfs_xattr.h b/include/linux/reiserfs_xattr.h
index 6deef5dc95fb..1a3ca8f80200 100644
--- a/include/linux/reiserfs_xattr.h
+++ b/include/linux/reiserfs_xattr.h
@@ -45,6 +45,7 @@ int reiserfs_permission(struct inode *inode, int mask, unsigned int flags);
45 45
46#ifdef CONFIG_REISERFS_FS_XATTR 46#ifdef CONFIG_REISERFS_FS_XATTR
47#define has_xattr_dir(inode) (REISERFS_I(inode)->i_flags & i_has_xattr_dir) 47#define has_xattr_dir(inode) (REISERFS_I(inode)->i_flags & i_has_xattr_dir)
48int reiserfs_check_acl(struct inode *inode, int mask, unsigned int flags);
48ssize_t reiserfs_getxattr(struct dentry *dentry, const char *name, 49ssize_t reiserfs_getxattr(struct dentry *dentry, const char *name,
49 void *buffer, size_t size); 50 void *buffer, size_t size);
50int reiserfs_setxattr(struct dentry *dentry, const char *name, 51int reiserfs_setxattr(struct dentry *dentry, const char *name,
@@ -122,6 +123,7 @@ static inline void reiserfs_init_xattr_rwsem(struct inode *inode)
122#define reiserfs_setxattr NULL 123#define reiserfs_setxattr NULL
123#define reiserfs_listxattr NULL 124#define reiserfs_listxattr NULL
124#define reiserfs_removexattr NULL 125#define reiserfs_removexattr NULL
126#define reiserfs_check_acl NULL
125 127
126static inline void reiserfs_init_xattr_rwsem(struct inode *inode) 128static inline void reiserfs_init_xattr_rwsem(struct inode *inode)
127{ 129{