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
/
jfs
/
jfs_acl.h
diff --git
a/fs/jfs/jfs_acl.h
b/fs/jfs/jfs_acl.h
index
d2ae430
..
a762937
100644
(file)
--- a/
fs/jfs/jfs_acl.h
+++ b/
fs/jfs/jfs_acl.h
@@
-20,11
+20,17
@@
#ifdef CONFIG_JFS_POSIX_ACL
#ifdef CONFIG_JFS_POSIX_ACL
-#include <linux/xattr_acl.h>
-
int jfs_permission(struct inode *, int, struct nameidata *);
int jfs_permission(struct inode *, int, struct nameidata *);
-int jfs_init_acl(struct inode *, struct inode *);
+int jfs_init_acl(
tid_t,
struct inode *, struct inode *);
int jfs_setattr(struct dentry *, struct iattr *);
int jfs_setattr(struct dentry *, struct iattr *);
-#endif /* CONFIG_JFS_POSIX_ACL */
+#else
+
+static inline int jfs_init_acl(tid_t tid, struct inode *inode,
+ struct inode *dir)
+{
+ return 0;
+}
+
+#endif
#endif /* _H_JFS_ACL */
#endif /* _H_JFS_ACL */