diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-08 21:01:13 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-24 08:17:06 -0400 |
commit | 7a77b15d9294749809de918e24bebc39e0fbc9ab (patch) | |
tree | d5e0d6d46dbcfece1c99854fbfc642e671d12b53 /fs/reiserfs/super.c | |
parent | e68888bcb60ccba4dc21df9f2d8cd7325b64dce7 (diff) |
switch reiserfs to usual conventions for caching ACLs
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/reiserfs/super.c')
-rw-r--r-- | fs/reiserfs/super.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 2969773cfc22..b194451fc04b 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c | |||
@@ -530,8 +530,8 @@ static void init_once(void *foo) | |||
530 | INIT_LIST_HEAD(&ei->i_prealloc_list); | 530 | INIT_LIST_HEAD(&ei->i_prealloc_list); |
531 | inode_init_once(&ei->vfs_inode); | 531 | inode_init_once(&ei->vfs_inode); |
532 | #ifdef CONFIG_REISERFS_FS_POSIX_ACL | 532 | #ifdef CONFIG_REISERFS_FS_POSIX_ACL |
533 | ei->i_acl_access = NULL; | 533 | ei->i_acl_access = ACL_NOT_CACHED; |
534 | ei->i_acl_default = NULL; | 534 | ei->i_acl_default = ACL_NOT_CACHED; |
535 | #endif | 535 | #endif |
536 | } | 536 | } |
537 | 537 | ||
@@ -586,14 +586,14 @@ static void reiserfs_clear_inode(struct inode *inode) | |||
586 | struct posix_acl *acl; | 586 | struct posix_acl *acl; |
587 | 587 | ||
588 | acl = REISERFS_I(inode)->i_acl_access; | 588 | acl = REISERFS_I(inode)->i_acl_access; |
589 | if (acl && !IS_ERR(acl)) | 589 | if (acl && acl != ACL_NOT_CACHED) |
590 | posix_acl_release(acl); | 590 | posix_acl_release(acl); |
591 | REISERFS_I(inode)->i_acl_access = NULL; | 591 | REISERFS_I(inode)->i_acl_access = ACL_NOT_CACHED; |
592 | 592 | ||
593 | acl = REISERFS_I(inode)->i_acl_default; | 593 | acl = REISERFS_I(inode)->i_acl_default; |
594 | if (acl && !IS_ERR(acl)) | 594 | if (acl && acl != ACL_NOT_CACHED) |
595 | posix_acl_release(acl); | 595 | posix_acl_release(acl); |
596 | REISERFS_I(inode)->i_acl_default = NULL; | 596 | REISERFS_I(inode)->i_acl_default = ACL_NOT_CACHED; |
597 | } | 597 | } |
598 | #else | 598 | #else |
599 | #define reiserfs_clear_inode NULL | 599 | #define reiserfs_clear_inode NULL |