git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
string: factorize skip_spaces and export it to be generally available
[safe/jmp/linux-2.6]
/
fs
/
jfs
/
acl.c
diff --git
a/fs/jfs/acl.c
b/fs/jfs/acl.c
index
91fa3ad
..
d66477c
100644
(file)
--- a/
fs/jfs/acl.c
+++ b/
fs/jfs/acl.c
@@
-67,10
+67,8
@@
static struct posix_acl *jfs_get_acl(struct inode *inode, int type)
acl = posix_acl_from_xattr(value, size);
}
kfree(value);
acl = posix_acl_from_xattr(value, size);
}
kfree(value);
- if (!IS_ERR(acl))
{
+ if (!IS_ERR(acl))
set_cached_acl(inode, type, acl);
set_cached_acl(inode, type, acl);
- posix_acl_release(acl);
- }
return acl;
}
return acl;
}
@@
-116,7
+114,7
@@
out:
return rc;
}
return rc;
}
-
static
int jfs_check_acl(struct inode *inode, int mask)
+int jfs_check_acl(struct inode *inode, int mask)
{
struct posix_acl *acl = jfs_get_acl(inode, ACL_TYPE_ACCESS);
{
struct posix_acl *acl = jfs_get_acl(inode, ACL_TYPE_ACCESS);
@@
-131,11
+129,6
@@
static int jfs_check_acl(struct inode *inode, int mask)
return -EAGAIN;
}
return -EAGAIN;
}
-int jfs_permission(struct inode *inode, int mask)
-{
- return generic_permission(inode, mask, jfs_check_acl);
-}
-
int jfs_init_acl(tid_t tid, struct inode *inode, struct inode *dir)
{
struct posix_acl *acl = NULL;
int jfs_init_acl(tid_t tid, struct inode *inode, struct inode *dir)
{
struct posix_acl *acl = NULL;