diff options
Diffstat (limited to 'fs/reiserfs/xattr_acl.c')
-rw-r--r-- | fs/reiserfs/xattr_acl.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c index e302071903a1..c312881c5f53 100644 --- a/fs/reiserfs/xattr_acl.c +++ b/fs/reiserfs/xattr_acl.c | |||
@@ -4,7 +4,7 @@ | |||
4 | #include <linux/errno.h> | 4 | #include <linux/errno.h> |
5 | #include <linux/pagemap.h> | 5 | #include <linux/pagemap.h> |
6 | #include <linux/xattr.h> | 6 | #include <linux/xattr.h> |
7 | #include <linux/xattr_acl.h> | 7 | #include <linux/posix_acl_xattr.h> |
8 | #include <linux/reiserfs_xattr.h> | 8 | #include <linux/reiserfs_xattr.h> |
9 | #include <linux/reiserfs_acl.h> | 9 | #include <linux/reiserfs_acl.h> |
10 | #include <asm/uaccess.h> | 10 | #include <asm/uaccess.h> |
@@ -192,11 +192,11 @@ reiserfs_get_acl(struct inode *inode, int type) | |||
192 | 192 | ||
193 | switch (type) { | 193 | switch (type) { |
194 | case ACL_TYPE_ACCESS: | 194 | case ACL_TYPE_ACCESS: |
195 | name = XATTR_NAME_ACL_ACCESS; | 195 | name = POSIX_ACL_XATTR_ACCESS; |
196 | p_acl = &reiserfs_i->i_acl_access; | 196 | p_acl = &reiserfs_i->i_acl_access; |
197 | break; | 197 | break; |
198 | case ACL_TYPE_DEFAULT: | 198 | case ACL_TYPE_DEFAULT: |
199 | name = XATTR_NAME_ACL_DEFAULT; | 199 | name = POSIX_ACL_XATTR_DEFAULT; |
200 | p_acl = &reiserfs_i->i_acl_default; | 200 | p_acl = &reiserfs_i->i_acl_default; |
201 | break; | 201 | break; |
202 | default: | 202 | default: |
@@ -260,7 +260,7 @@ reiserfs_set_acl(struct inode *inode, int type, struct posix_acl *acl) | |||
260 | 260 | ||
261 | switch (type) { | 261 | switch (type) { |
262 | case ACL_TYPE_ACCESS: | 262 | case ACL_TYPE_ACCESS: |
263 | name = XATTR_NAME_ACL_ACCESS; | 263 | name = POSIX_ACL_XATTR_ACCESS; |
264 | p_acl = &reiserfs_i->i_acl_access; | 264 | p_acl = &reiserfs_i->i_acl_access; |
265 | if (acl) { | 265 | if (acl) { |
266 | mode_t mode = inode->i_mode; | 266 | mode_t mode = inode->i_mode; |
@@ -275,7 +275,7 @@ reiserfs_set_acl(struct inode *inode, int type, struct posix_acl *acl) | |||
275 | } | 275 | } |
276 | break; | 276 | break; |
277 | case ACL_TYPE_DEFAULT: | 277 | case ACL_TYPE_DEFAULT: |
278 | name = XATTR_NAME_ACL_DEFAULT; | 278 | name = POSIX_ACL_XATTR_DEFAULT; |
279 | p_acl = &reiserfs_i->i_acl_default; | 279 | p_acl = &reiserfs_i->i_acl_default; |
280 | if (!S_ISDIR (inode->i_mode)) | 280 | if (!S_ISDIR (inode->i_mode)) |
281 | return acl ? -EACCES : 0; | 281 | return acl ? -EACCES : 0; |
@@ -468,7 +468,7 @@ static int | |||
468 | posix_acl_access_get(struct inode *inode, const char *name, | 468 | posix_acl_access_get(struct inode *inode, const char *name, |
469 | void *buffer, size_t size) | 469 | void *buffer, size_t size) |
470 | { | 470 | { |
471 | if (strlen(name) != sizeof(XATTR_NAME_ACL_ACCESS)-1) | 471 | if (strlen(name) != sizeof(POSIX_ACL_XATTR_ACCESS)-1) |
472 | return -EINVAL; | 472 | return -EINVAL; |
473 | return xattr_get_acl(inode, ACL_TYPE_ACCESS, buffer, size); | 473 | return xattr_get_acl(inode, ACL_TYPE_ACCESS, buffer, size); |
474 | } | 474 | } |
@@ -477,7 +477,7 @@ static int | |||
477 | posix_acl_access_set(struct inode *inode, const char *name, | 477 | posix_acl_access_set(struct inode *inode, const char *name, |
478 | const void *value, size_t size, int flags) | 478 | const void *value, size_t size, int flags) |
479 | { | 479 | { |
480 | if (strlen(name) != sizeof(XATTR_NAME_ACL_ACCESS)-1) | 480 | if (strlen(name) != sizeof(POSIX_ACL_XATTR_ACCESS)-1) |
481 | return -EINVAL; | 481 | return -EINVAL; |
482 | return xattr_set_acl(inode, ACL_TYPE_ACCESS, value, size); | 482 | return xattr_set_acl(inode, ACL_TYPE_ACCESS, value, size); |
483 | } | 483 | } |
@@ -487,7 +487,7 @@ posix_acl_access_del (struct inode *inode, const char *name) | |||
487 | { | 487 | { |
488 | struct reiserfs_inode_info *reiserfs_i = REISERFS_I(inode); | 488 | struct reiserfs_inode_info *reiserfs_i = REISERFS_I(inode); |
489 | struct posix_acl **acl = &reiserfs_i->i_acl_access; | 489 | struct posix_acl **acl = &reiserfs_i->i_acl_access; |
490 | if (strlen(name) != sizeof(XATTR_NAME_ACL_ACCESS)-1) | 490 | if (strlen(name) != sizeof(POSIX_ACL_XATTR_ACCESS)-1) |
491 | return -EINVAL; | 491 | return -EINVAL; |
492 | if (!IS_ERR (*acl) && *acl) { | 492 | if (!IS_ERR (*acl) && *acl) { |
493 | posix_acl_release (*acl); | 493 | posix_acl_release (*acl); |
@@ -510,7 +510,7 @@ posix_acl_access_list (struct inode *inode, const char *name, int namelen, char | |||
510 | } | 510 | } |
511 | 511 | ||
512 | struct reiserfs_xattr_handler posix_acl_access_handler = { | 512 | struct reiserfs_xattr_handler posix_acl_access_handler = { |
513 | .prefix = XATTR_NAME_ACL_ACCESS, | 513 | .prefix = POSIX_ACL_XATTR_ACCESS, |
514 | .get = posix_acl_access_get, | 514 | .get = posix_acl_access_get, |
515 | .set = posix_acl_access_set, | 515 | .set = posix_acl_access_set, |
516 | .del = posix_acl_access_del, | 516 | .del = posix_acl_access_del, |
@@ -521,7 +521,7 @@ static int | |||
521 | posix_acl_default_get (struct inode *inode, const char *name, | 521 | posix_acl_default_get (struct inode *inode, const char *name, |
522 | void *buffer, size_t size) | 522 | void *buffer, size_t size) |
523 | { | 523 | { |
524 | if (strlen(name) != sizeof(XATTR_NAME_ACL_DEFAULT)-1) | 524 | if (strlen(name) != sizeof(POSIX_ACL_XATTR_DEFAULT)-1) |
525 | return -EINVAL; | 525 | return -EINVAL; |
526 | return xattr_get_acl(inode, ACL_TYPE_DEFAULT, buffer, size); | 526 | return xattr_get_acl(inode, ACL_TYPE_DEFAULT, buffer, size); |
527 | } | 527 | } |
@@ -530,7 +530,7 @@ static int | |||
530 | posix_acl_default_set(struct inode *inode, const char *name, | 530 | posix_acl_default_set(struct inode *inode, const char *name, |
531 | const void *value, size_t size, int flags) | 531 | const void *value, size_t size, int flags) |
532 | { | 532 | { |
533 | if (strlen(name) != sizeof(XATTR_NAME_ACL_DEFAULT)-1) | 533 | if (strlen(name) != sizeof(POSIX_ACL_XATTR_DEFAULT)-1) |
534 | return -EINVAL; | 534 | return -EINVAL; |
535 | return xattr_set_acl(inode, ACL_TYPE_DEFAULT, value, size); | 535 | return xattr_set_acl(inode, ACL_TYPE_DEFAULT, value, size); |
536 | } | 536 | } |
@@ -540,7 +540,7 @@ posix_acl_default_del (struct inode *inode, const char *name) | |||
540 | { | 540 | { |
541 | struct reiserfs_inode_info *reiserfs_i = REISERFS_I(inode); | 541 | struct reiserfs_inode_info *reiserfs_i = REISERFS_I(inode); |
542 | struct posix_acl **acl = &reiserfs_i->i_acl_default; | 542 | struct posix_acl **acl = &reiserfs_i->i_acl_default; |
543 | if (strlen(name) != sizeof(XATTR_NAME_ACL_DEFAULT)-1) | 543 | if (strlen(name) != sizeof(POSIX_ACL_XATTR_DEFAULT)-1) |
544 | return -EINVAL; | 544 | return -EINVAL; |
545 | if (!IS_ERR (*acl) && *acl) { | 545 | if (!IS_ERR (*acl) && *acl) { |
546 | posix_acl_release (*acl); | 546 | posix_acl_release (*acl); |
@@ -563,7 +563,7 @@ posix_acl_default_list (struct inode *inode, const char *name, int namelen, char | |||
563 | } | 563 | } |
564 | 564 | ||
565 | struct reiserfs_xattr_handler posix_acl_default_handler = { | 565 | struct reiserfs_xattr_handler posix_acl_default_handler = { |
566 | .prefix = XATTR_NAME_ACL_DEFAULT, | 566 | .prefix = POSIX_ACL_XATTR_DEFAULT, |
567 | .get = posix_acl_default_get, | 567 | .get = posix_acl_default_get, |
568 | .set = posix_acl_default_set, | 568 | .set = posix_acl_default_set, |
569 | .del = posix_acl_default_del, | 569 | .del = posix_acl_default_del, |