projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] PCI: pci_find_device remove (alpha/kernel/sys_alcor.c)
[powerpc.git]
/
fs
/
jfs
/
acl.c
diff --git
a/fs/jfs/acl.c
b/fs/jfs/acl.c
index
30a2bf9
..
461e493
100644
(file)
--- a/
fs/jfs/acl.c
+++ b/
fs/jfs/acl.c
@@
-21,7
+21,9
@@
#include <linux/sched.h>
#include <linux/fs.h>
#include <linux/quotaops.h>
#include <linux/sched.h>
#include <linux/fs.h>
#include <linux/quotaops.h>
+#include <linux/posix_acl_xattr.h>
#include "jfs_incore.h"
#include "jfs_incore.h"
+#include "jfs_txnmgr.h"
#include "jfs_xattr.h"
#include "jfs_acl.h"
#include "jfs_xattr.h"
#include "jfs_acl.h"
@@
-36,11
+38,11
@@
static struct posix_acl *jfs_get_acl(struct inode *inode, int type)
switch(type) {
case ACL_TYPE_ACCESS:
switch(type) {
case ACL_TYPE_ACCESS:
- ea_name =
XATTR_NAME_ACL
_ACCESS;
+ ea_name =
POSIX_ACL_XATTR
_ACCESS;
p_acl = &ji->i_acl;
break;
case ACL_TYPE_DEFAULT:
p_acl = &ji->i_acl;
break;
case ACL_TYPE_DEFAULT:
- ea_name =
XATTR_NAME_ACL
_DEFAULT;
+ ea_name =
POSIX_ACL_XATTR
_DEFAULT;
p_acl = &ji->i_default_acl;
break;
default:
p_acl = &ji->i_default_acl;
break;
default:
@@
-74,7
+76,8
@@
static struct posix_acl *jfs_get_acl(struct inode *inode, int type)
return acl;
}
return acl;
}
-static int jfs_set_acl(struct inode *inode, int type, struct posix_acl *acl)
+static int jfs_set_acl(tid_t tid, struct inode *inode, int type,
+ struct posix_acl *acl)
{
char *ea_name;
struct jfs_inode_info *ji = JFS_IP(inode);
{
char *ea_name;
struct jfs_inode_info *ji = JFS_IP(inode);
@@
-88,11
+91,11
@@
static int jfs_set_acl(struct inode *inode, int type, struct posix_acl *acl)
switch(type) {
case ACL_TYPE_ACCESS:
switch(type) {
case ACL_TYPE_ACCESS:
- ea_name =
XATTR_NAME_ACL
_ACCESS;
+ ea_name =
POSIX_ACL_XATTR
_ACCESS;
p_acl = &ji->i_acl;
break;
case ACL_TYPE_DEFAULT:
p_acl = &ji->i_acl;
break;
case ACL_TYPE_DEFAULT:
- ea_name =
XATTR_NAME_ACL
_DEFAULT;
+ ea_name =
POSIX_ACL_XATTR
_DEFAULT;
p_acl = &ji->i_default_acl;
if (!S_ISDIR(inode->i_mode))
return acl ? -EACCES : 0;
p_acl = &ji->i_default_acl;
if (!S_ISDIR(inode->i_mode))
return acl ? -EACCES : 0;
@@
-101,7
+104,7
@@
static int jfs_set_acl(struct inode *inode, int type, struct posix_acl *acl)
return -EINVAL;
}
if (acl) {
return -EINVAL;
}
if (acl) {
- size =
xattr_acl
_size(acl->a_count);
+ size =
posix_acl_xattr
_size(acl->a_count);
value = kmalloc(size, GFP_KERNEL);
if (!value)
return -ENOMEM;
value = kmalloc(size, GFP_KERNEL);
if (!value)
return -ENOMEM;
@@
-109,7
+112,7
@@
static int jfs_set_acl(struct inode *inode, int type, struct posix_acl *acl)
if (rc < 0)
goto out;
}
if (rc < 0)
goto out;
}
- rc = __jfs_setxattr(inode, ea_name, value, size, 0);
+ rc = __jfs_setxattr(
tid,
inode, ea_name, value, size, 0);
out:
kfree(value);
out:
kfree(value);
@@
-142,7
+145,7
@@
int jfs_permission(struct inode *inode, int mask, struct nameidata *nd)
return generic_permission(inode, mask, jfs_check_acl);
}
return generic_permission(inode, mask, jfs_check_acl);
}
-int jfs_init_acl(struct inode *inode, struct inode *dir)
+int jfs_init_acl(
tid_t tid,
struct inode *inode, struct inode *dir)
{
struct posix_acl *acl = NULL;
struct posix_acl *clone;
{
struct posix_acl *acl = NULL;
struct posix_acl *clone;
@@
-158,7
+161,7
@@
int jfs_init_acl(struct inode *inode, struct inode *dir)
if (acl) {
if (S_ISDIR(inode->i_mode)) {
if (acl) {
if (S_ISDIR(inode->i_mode)) {
- rc = jfs_set_acl(inode, ACL_TYPE_DEFAULT, acl);
+ rc = jfs_set_acl(
tid,
inode, ACL_TYPE_DEFAULT, acl);
if (rc)
goto cleanup;
}
if (rc)
goto cleanup;
}
@@
-172,7
+175,8
@@
int jfs_init_acl(struct inode *inode, struct inode *dir)
if (rc >= 0) {
inode->i_mode = mode;
if (rc > 0)
if (rc >= 0) {
inode->i_mode = mode;
if (rc > 0)
- rc = jfs_set_acl(inode, ACL_TYPE_ACCESS, clone);
+ rc = jfs_set_acl(tid, inode, ACL_TYPE_ACCESS,
+ clone);
}
posix_acl_release(clone);
cleanup:
}
posix_acl_release(clone);
cleanup:
@@
-201,8
+205,15
@@
static int jfs_acl_chmod(struct inode *inode)
return -ENOMEM;
rc = posix_acl_chmod_masq(clone, inode->i_mode);
return -ENOMEM;
rc = posix_acl_chmod_masq(clone, inode->i_mode);
- if (!rc)
- rc = jfs_set_acl(inode, ACL_TYPE_ACCESS, clone);
+ if (!rc) {
+ tid_t tid = txBegin(inode->i_sb, 0);
+ down(&JFS_IP(inode)->commit_sem);
+ rc = jfs_set_acl(tid, inode, ACL_TYPE_ACCESS, clone);
+ if (!rc)
+ rc = txCommit(tid, 1, &inode, 0);
+ txEnd(tid);
+ up(&JFS_IP(inode)->commit_sem);
+ }
posix_acl_release(clone);
return rc;
posix_acl_release(clone);
return rc;