git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switch reiserfs to inode->i_acl
[pandora-kernel.git]
/
fs
/
reiserfs
/
xattr_acl.c
diff --git
a/fs/reiserfs/xattr_acl.c
b/fs/reiserfs/xattr_acl.c
index
c303c42
..
b6e473f
100644
(file)
--- a/
fs/reiserfs/xattr_acl.c
+++ b/
fs/reiserfs/xattr_acl.c
@@
-192,7
+192,7
@@
static inline void iset_acl(struct inode *inode, struct posix_acl **i_acl,
struct posix_acl *acl)
{
spin_lock(&inode->i_lock);
struct posix_acl *acl)
{
spin_lock(&inode->i_lock);
- if (*i_acl !=
ERR_PTR(-ENODATA)
)
+ if (*i_acl !=
ACL_NOT_CACHED
)
posix_acl_release(*i_acl);
*i_acl = posix_acl_dup(acl);
spin_unlock(&inode->i_lock);
posix_acl_release(*i_acl);
*i_acl = posix_acl_dup(acl);
spin_unlock(&inode->i_lock);
@@
-201,10
+201,10
@@
static inline void iset_acl(struct inode *inode, struct posix_acl **i_acl,
static inline struct posix_acl *iget_acl(struct inode *inode,
struct posix_acl **i_acl)
{
static inline struct posix_acl *iget_acl(struct inode *inode,
struct posix_acl **i_acl)
{
- struct posix_acl *acl =
ERR_PTR(-ENODATA)
;
+ struct posix_acl *acl =
ACL_NOT_CACHED
;
spin_lock(&inode->i_lock);
spin_lock(&inode->i_lock);
- if (*i_acl !=
ERR_PTR(-ENODATA)
)
+ if (*i_acl !=
ACL_NOT_CACHED
)
acl = posix_acl_dup(*i_acl);
spin_unlock(&inode->i_lock);
acl = posix_acl_dup(*i_acl);
spin_unlock(&inode->i_lock);
@@
-223,31
+223,28
@@
struct posix_acl *reiserfs_get_acl(struct inode *inode, int type)
struct posix_acl *acl, **p_acl;
int size;
int retval;
struct posix_acl *acl, **p_acl;
int size;
int retval;
- struct reiserfs_inode_info *reiserfs_i = REISERFS_I(inode);
switch (type) {
case ACL_TYPE_ACCESS:
name = POSIX_ACL_XATTR_ACCESS;
switch (type) {
case ACL_TYPE_ACCESS:
name = POSIX_ACL_XATTR_ACCESS;
- p_acl = &
reiserfs_i->i_acl_access
;
+ p_acl = &
inode->i_acl
;
break;
case ACL_TYPE_DEFAULT:
name = POSIX_ACL_XATTR_DEFAULT;
break;
case ACL_TYPE_DEFAULT:
name = POSIX_ACL_XATTR_DEFAULT;
- p_acl = &
reiserfs_i->i_acl_default
;
+ p_acl = &
inode->i_default_acl
;
break;
default:
return ERR_PTR(-EINVAL);
}
acl = iget_acl(inode, p_acl);
break;
default:
return ERR_PTR(-EINVAL);
}
acl = iget_acl(inode, p_acl);
- if (acl
&& !IS_ERR(acl)
)
+ if (acl
!= ACL_NOT_CACHED
)
return acl;
return acl;
- else if (PTR_ERR(acl) == -ENODATA)
- return NULL;
size = reiserfs_xattr_get(inode, name, NULL, 0);
if (size < 0) {
if (size == -ENODATA || size == -ENOSYS) {
size = reiserfs_xattr_get(inode, name, NULL, 0);
if (size < 0) {
if (size == -ENODATA || size == -ENOSYS) {
- *p_acl =
ERR_PTR(-ENODATA)
;
+ *p_acl =
NULL
;
return NULL;
}
return ERR_PTR(size);
return NULL;
}
return ERR_PTR(size);
@@
-262,7
+259,7
@@
struct posix_acl *reiserfs_get_acl(struct inode *inode, int type)
/* This shouldn't actually happen as it should have
been caught above.. but just in case */
acl = NULL;
/* This shouldn't actually happen as it should have
been caught above.. but just in case */
acl = NULL;
- *p_acl =
ERR_PTR(-ENODATA)
;
+ *p_acl =
acl
;
} else if (retval < 0) {
acl = ERR_PTR(retval);
} else {
} else if (retval < 0) {
acl = ERR_PTR(retval);
} else {
@@
-290,7
+287,6
@@
reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode,
struct posix_acl **p_acl;
size_t size = 0;
int error;
struct posix_acl **p_acl;
size_t size = 0;
int error;
- struct reiserfs_inode_info *reiserfs_i = REISERFS_I(inode);
if (S_ISLNK(inode->i_mode))
return -EOPNOTSUPP;
if (S_ISLNK(inode->i_mode))
return -EOPNOTSUPP;
@@
-298,7
+294,7
@@
reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode,
switch (type) {
case ACL_TYPE_ACCESS:
name = POSIX_ACL_XATTR_ACCESS;
switch (type) {
case ACL_TYPE_ACCESS:
name = POSIX_ACL_XATTR_ACCESS;
- p_acl = &
reiserfs_i->i_acl_access
;
+ p_acl = &
inode->i_acl
;
if (acl) {
mode_t mode = inode->i_mode;
error = posix_acl_equiv_mode(acl, &mode);
if (acl) {
mode_t mode = inode->i_mode;
error = posix_acl_equiv_mode(acl, &mode);
@@
-313,7
+309,7
@@
reiserfs_set_acl(struct reiserfs_transaction_handle *th, struct inode *inode,
break;
case ACL_TYPE_DEFAULT:
name = POSIX_ACL_XATTR_DEFAULT;
break;
case ACL_TYPE_DEFAULT:
name = POSIX_ACL_XATTR_DEFAULT;
- p_acl = &
reiserfs_i->i_acl_default
;
+ p_acl = &
inode->i_default_acl
;
if (!S_ISDIR(inode->i_mode))
return acl ? -EACCES : 0;
break;
if (!S_ISDIR(inode->i_mode))
return acl ? -EACCES : 0;
break;
@@
-379,11
+375,8
@@
reiserfs_inherit_default_acl(struct reiserfs_transaction_handle *th,
}
acl = reiserfs_get_acl(dir, ACL_TYPE_DEFAULT);
}
acl = reiserfs_get_acl(dir, ACL_TYPE_DEFAULT);
- if (IS_ERR(acl)) {
- if (PTR_ERR(acl) == -ENODATA)
- goto apply_umask;
+ if (IS_ERR(acl))
return PTR_ERR(acl);
return PTR_ERR(acl);
- }
if (acl) {
struct posix_acl *acl_copy;
if (acl) {
struct posix_acl *acl_copy;