Re: Build failure latest git. (acl related)

[Markus Trippelsdorf <markus@trippelsdorf.de>]

On Wed, Jun 24, 2009 at 10:09:41PM +0200, Markus Trippelsdorf wrote:
> The kernel does not build anymore (latest git):
> 
> In file included from include/linux/nfsacl.h:31,
>                  from include/linux/nfs_xdr.h:4,
>                  from include/linux/nfs_fs.h:58,
>                  from init/do_mounts.c:19:
> include/linux/posix_acl.h: In function `get_cached_acl':
> include/linux/posix_acl.h:91: error: `struct inode' has no member named `i_acl'
> include/linux/posix_acl.h:94: error: `struct inode' has no member named `i_default_acl'
> include/linux/posix_acl.h: In function `set_cached_acl':
> include/linux/posix_acl.h:118: error: `struct inode' has no member named `i_acl'
> include/linux/posix_acl.h:119: error: `struct inode' has no member named `i_acl'
> include/linux/posix_acl.h:122: error: `struct inode' has no member named `i_default_acl'
> include/linux/posix_acl.h:123: error: `struct inode' has no member named `i_default_acl'
> include/linux/posix_acl.h: In function `forget_cached_acl':
> include/linux/posix_acl.h:137: error: `struct inode' has no member named `i_acl'
> include/linux/posix_acl.h:138: error: `struct inode' has no member named `i_acl'
> include/linux/posix_acl.h:141: error: `struct inode' has no member named `i_default_acl'
> include/linux/posix_acl.h:142: error: `struct inode' has no member named `i_default_acl'
> make[1]: *** [init/do_mounts.o] Error 1
> make[1]: *** Waiting for unfinished jobs....
> 

This patch should fix it:


diff --git a/include/linux/posix_acl.h b/include/linux/posix_acl.h
index 0cdba01..c513466 100644
--- a/include/linux/posix_acl.h
+++ b/include/linux/posix_acl.h
@@ -83,6 +83,7 @@ extern int posix_acl_chmod_masq(struct posix_acl *, mode_t);
 extern struct posix_acl *get_posix_acl(struct inode *, int);
 extern int set_posix_acl(struct inode *, int, struct posix_acl *);
 
+#ifdef CONFIG_FS_POSIX_ACL
 static inline struct posix_acl *get_cached_acl(struct inode *inode, int type)
 {
 	struct posix_acl **p, *acl;
@@ -146,5 +147,5 @@ static inline void forget_cached_acl(struct inode *inode, int type)
 	if (old != ACL_NOT_CACHED)
 		posix_acl_release(old);
 }
-
+#endif
 #endif  /* __LINUX_POSIX_ACL_H */
-- 
Markus