aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext3
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext3')
-rw-r--r--fs/ext3/acl.c12
-rw-r--r--fs/ext3/acl.h2
2 files changed, 7 insertions, 7 deletions
diff --git a/fs/ext3/acl.c b/fs/ext3/acl.c
index 638c13a26c03..133f5aa581bb 100644
--- a/fs/ext3/acl.c
+++ b/fs/ext3/acl.c
@@ -417,12 +417,12 @@ static size_t
417ext3_xattr_list_acl_access(struct inode *inode, char *list, size_t list_len, 417ext3_xattr_list_acl_access(struct inode *inode, char *list, size_t list_len,
418 const char *name, size_t name_len) 418 const char *name, size_t name_len)
419{ 419{
420 const size_t size = sizeof(XATTR_NAME_ACL_ACCESS); 420 const size_t size = sizeof(POSIX_ACL_XATTR_ACCESS);
421 421
422 if (!test_opt(inode->i_sb, POSIX_ACL)) 422 if (!test_opt(inode->i_sb, POSIX_ACL))
423 return 0; 423 return 0;
424 if (list && size <= list_len) 424 if (list && size <= list_len)
425 memcpy(list, XATTR_NAME_ACL_ACCESS, size); 425 memcpy(list, POSIX_ACL_XATTR_ACCESS, size);
426 return size; 426 return size;
427} 427}
428 428
@@ -430,12 +430,12 @@ static size_t
430ext3_xattr_list_acl_default(struct inode *inode, char *list, size_t list_len, 430ext3_xattr_list_acl_default(struct inode *inode, char *list, size_t list_len,
431 const char *name, size_t name_len) 431 const char *name, size_t name_len)
432{ 432{
433 const size_t size = sizeof(XATTR_NAME_ACL_DEFAULT); 433 const size_t size = sizeof(POSIX_ACL_XATTR_DEFAULT);
434 434
435 if (!test_opt(inode->i_sb, POSIX_ACL)) 435 if (!test_opt(inode->i_sb, POSIX_ACL))
436 return 0; 436 return 0;
437 if (list && size <= list_len) 437 if (list && size <= list_len)
438 memcpy(list, XATTR_NAME_ACL_DEFAULT, size); 438 memcpy(list, POSIX_ACL_XATTR_DEFAULT, size);
439 return size; 439 return size;
440} 440}
441 441
@@ -535,14 +535,14 @@ ext3_xattr_set_acl_default(struct inode *inode, const char *name,
535} 535}
536 536
537struct xattr_handler ext3_xattr_acl_access_handler = { 537struct xattr_handler ext3_xattr_acl_access_handler = {
538 .prefix = XATTR_NAME_ACL_ACCESS, 538 .prefix = POSIX_ACL_XATTR_ACCESS,
539 .list = ext3_xattr_list_acl_access, 539 .list = ext3_xattr_list_acl_access,
540 .get = ext3_xattr_get_acl_access, 540 .get = ext3_xattr_get_acl_access,
541 .set = ext3_xattr_set_acl_access, 541 .set = ext3_xattr_set_acl_access,
542}; 542};
543 543
544struct xattr_handler ext3_xattr_acl_default_handler = { 544struct xattr_handler ext3_xattr_acl_default_handler = {
545 .prefix = XATTR_NAME_ACL_DEFAULT, 545 .prefix = POSIX_ACL_XATTR_DEFAULT,
546 .list = ext3_xattr_list_acl_default, 546 .list = ext3_xattr_list_acl_default,
547 .get = ext3_xattr_get_acl_default, 547 .get = ext3_xattr_get_acl_default,
548 .set = ext3_xattr_set_acl_default, 548 .set = ext3_xattr_set_acl_default,
diff --git a/fs/ext3/acl.h b/fs/ext3/acl.h
index 98af0c0d0ba9..92d50b53a933 100644
--- a/fs/ext3/acl.h
+++ b/fs/ext3/acl.h
@@ -4,7 +4,7 @@
4 (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org> 4 (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org>
5*/ 5*/
6 6
7#include <linux/xattr_acl.h> 7#include <linux/posix_acl_xattr.h>
8 8
9#define EXT3_ACL_VERSION 0x0001 9#define EXT3_ACL_VERSION 0x0001
10 10