diff options
| author | Chunwei Chen <[email protected]> | 2014-03-28 12:59:36 +0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-04-10 14:27:03 -0700 |
| commit | 408ec0d2e13188f6f500f7010b5bc5bc5bf5bb9c (patch) | |
| tree | 676aa1a36122af179ce424eaed6441d055e867a6 /include/linux | |
| parent | 443c3f73321d18d0092b11390e628e3de9d15d7c (diff) | |
Linux 3.14 compat: posix_acl_{create,chmod}
posix_acl_{create,chmod} is changed to __posix_acl_{create_chmod}
Signed-off-by: Chunwei Chen <[email protected]>
Signed-off-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #2124
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/vfs_compat.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h index 4778491fa..4358cd288 100644 --- a/include/linux/vfs_compat.h +++ b/include/linux/vfs_compat.h @@ -263,9 +263,13 @@ zpl_forget_cached_acl(struct inode *ip, int type) { #define zpl_inode_owner_or_capable(ip) is_owner_or_cap(ip) #endif /* HAVE_INODE_OWNER_OR_CAPABLE */ -#ifndef HAVE_POSIX_ACL_CHMOD +#ifndef HAVE___POSIX_ACL_CHMOD +#ifdef HAVE_POSIX_ACL_CHMOD +#define __posix_acl_chmod(acl, gfp, mode) posix_acl_chmod(acl, gfp, mode) +#define __posix_acl_create(acl, gfp, mode) posix_acl_create(acl, gfp, mode) +#else static inline int -posix_acl_chmod(struct posix_acl **acl, int flags, umode_t umode) { +__posix_acl_chmod(struct posix_acl **acl, int flags, umode_t umode) { struct posix_acl *oldacl = *acl; mode_t mode = umode; int error; @@ -286,7 +290,7 @@ posix_acl_chmod(struct posix_acl **acl, int flags, umode_t umode) { } static inline int -posix_acl_create(struct posix_acl **acl, int flags, umode_t *umodep) { +__posix_acl_create(struct posix_acl **acl, int flags, umode_t *umodep) { struct posix_acl *oldacl = *acl; mode_t mode = *umodep; int error; @@ -308,6 +312,7 @@ posix_acl_create(struct posix_acl **acl, int flags, umode_t *umodep) { return (error); } #endif /* HAVE_POSIX_ACL_CHMOD */ +#endif /* HAVE___POSIX_ACL_CHMOD */ #ifndef HAVE_CURRENT_UMASK static inline int |