diff options
Diffstat (limited to 'fs/ext2')
-rw-r--r-- | fs/ext2/acl.c | 12 | ||||
-rw-r--r-- | fs/ext2/acl.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/fs/ext2/acl.c b/fs/ext2/acl.c index 25f4a64fd6bc..213148c36ebe 100644 --- a/fs/ext2/acl.c +++ b/fs/ext2/acl.c | |||
@@ -396,12 +396,12 @@ static size_t | |||
396 | ext2_xattr_list_acl_access(struct inode *inode, char *list, size_t list_size, | 396 | ext2_xattr_list_acl_access(struct inode *inode, char *list, size_t list_size, |
397 | const char *name, size_t name_len) | 397 | const char *name, size_t name_len) |
398 | { | 398 | { |
399 | const size_t size = sizeof(XATTR_NAME_ACL_ACCESS); | 399 | const size_t size = sizeof(POSIX_ACL_XATTR_ACCESS); |
400 | 400 | ||
401 | if (!test_opt(inode->i_sb, POSIX_ACL)) | 401 | if (!test_opt(inode->i_sb, POSIX_ACL)) |
402 | return 0; | 402 | return 0; |
403 | if (list && size <= list_size) | 403 | if (list && size <= list_size) |
404 | memcpy(list, XATTR_NAME_ACL_ACCESS, size); | 404 | memcpy(list, POSIX_ACL_XATTR_ACCESS, size); |
405 | return size; | 405 | return size; |
406 | } | 406 | } |
407 | 407 | ||
@@ -409,12 +409,12 @@ static size_t | |||
409 | ext2_xattr_list_acl_default(struct inode *inode, char *list, size_t list_size, | 409 | ext2_xattr_list_acl_default(struct inode *inode, char *list, size_t list_size, |
410 | const char *name, size_t name_len) | 410 | const char *name, size_t name_len) |
411 | { | 411 | { |
412 | const size_t size = sizeof(XATTR_NAME_ACL_DEFAULT); | 412 | const size_t size = sizeof(POSIX_ACL_XATTR_DEFAULT); |
413 | 413 | ||
414 | if (!test_opt(inode->i_sb, POSIX_ACL)) | 414 | if (!test_opt(inode->i_sb, POSIX_ACL)) |
415 | return 0; | 415 | return 0; |
416 | if (list && size <= list_size) | 416 | if (list && size <= list_size) |
417 | memcpy(list, XATTR_NAME_ACL_DEFAULT, size); | 417 | memcpy(list, POSIX_ACL_XATTR_DEFAULT, size); |
418 | return size; | 418 | return size; |
419 | } | 419 | } |
420 | 420 | ||
@@ -506,14 +506,14 @@ ext2_xattr_set_acl_default(struct inode *inode, const char *name, | |||
506 | } | 506 | } |
507 | 507 | ||
508 | struct xattr_handler ext2_xattr_acl_access_handler = { | 508 | struct xattr_handler ext2_xattr_acl_access_handler = { |
509 | .prefix = XATTR_NAME_ACL_ACCESS, | 509 | .prefix = POSIX_ACL_XATTR_ACCESS, |
510 | .list = ext2_xattr_list_acl_access, | 510 | .list = ext2_xattr_list_acl_access, |
511 | .get = ext2_xattr_get_acl_access, | 511 | .get = ext2_xattr_get_acl_access, |
512 | .set = ext2_xattr_set_acl_access, | 512 | .set = ext2_xattr_set_acl_access, |
513 | }; | 513 | }; |
514 | 514 | ||
515 | struct xattr_handler ext2_xattr_acl_default_handler = { | 515 | struct xattr_handler ext2_xattr_acl_default_handler = { |
516 | .prefix = XATTR_NAME_ACL_DEFAULT, | 516 | .prefix = POSIX_ACL_XATTR_DEFAULT, |
517 | .list = ext2_xattr_list_acl_default, | 517 | .list = ext2_xattr_list_acl_default, |
518 | .get = ext2_xattr_get_acl_default, | 518 | .get = ext2_xattr_get_acl_default, |
519 | .set = ext2_xattr_set_acl_default, | 519 | .set = ext2_xattr_set_acl_default, |
diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h index fed96ae81a7d..0bde85bafe38 100644 --- a/fs/ext2/acl.h +++ b/fs/ext2/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 EXT2_ACL_VERSION 0x0001 | 9 | #define EXT2_ACL_VERSION 0x0001 |
10 | 10 | ||