Merge tag 'xtensa-next-20121008' of git://github.com/czankel/xtensa-linux

[firefly-linux-kernel-4.4.55.git] / include / linux / posix_acl_xattr.h

diff --git a/include/linux/posix_acl_xattr.h b/include/linux/posix_acl_xattr.h
index 6e53c34035cd5b77c7c3e86878a00a3b1861070e..ad93ad0f1db0b0afe072d587a6fd1507f2e35d84 100644 (file)
--- a/include/linux/posix_acl_xattr.h
+++ b/include/linux/posix_acl_xattr.h
@@ -52,7 +52,21 @@ posix_acl_xattr_count(size_t size)
        return size / sizeof(posix_acl_xattr_entry);
 }
 
-struct posix_acl *posix_acl_from_xattr(const void *value, size_t size);
-int posix_acl_to_xattr(const struct posix_acl *acl, void *buffer, size_t size);
+#ifdef CONFIG_FS_POSIX_ACL
+void posix_acl_fix_xattr_from_user(void *value, size_t size);
+void posix_acl_fix_xattr_to_user(void *value, size_t size);
+#else
+static inline void posix_acl_fix_xattr_from_user(void *value, size_t size)
+{
+}
+static inline void posix_acl_fix_xattr_to_user(void *value, size_t size)
+{
+}
+#endif
+
+struct posix_acl *posix_acl_from_xattr(struct user_namespace *user_ns, 
+                                      const void *value, size_t size);
+int posix_acl_to_xattr(struct user_namespace *user_ns,
+                      const struct posix_acl *acl, void *buffer, size_t size);
 
 #endif /* _POSIX_ACL_XATTR_H */