diff --git a/[refs] b/[refs] index 973d2922da2e..1e4d7b8675d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 165a2c1d514892ae917cdf80be9e5269015c1034 +refs/heads/master: bc5e483da61eb5ab8d24b4a919fb512e5886d02c diff --git a/trunk/include/linux/reiserfs_acl.h b/trunk/include/linux/reiserfs_acl.h index 0a3605099c44..806ec5b06707 100644 --- a/trunk/include/linux/reiserfs_acl.h +++ b/trunk/include/linux/reiserfs_acl.h @@ -58,9 +58,13 @@ extern struct reiserfs_xattr_handler posix_acl_default_handler; extern struct reiserfs_xattr_handler posix_acl_access_handler; #else -#define reiserfs_get_acl NULL #define reiserfs_cache_default_acl(inode) 0 +static inline struct posix_acl *reiserfs_get_acl(struct inode *inode, int type) +{ + return NULL; +} + static inline int reiserfs_xattr_posix_acl_init(void) { return 0;