Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / jfs / acl.c

diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c
index 0733a7b..bc0135a 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/posix_acl_xattr.h>
 #include "jfs_incore.h"
+#include "jfs_txnmgr.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:
-                       ea_name = XATTR_NAME_ACL_ACCESS;
+                       ea_name = POSIX_ACL_XATTR_ACCESS;
                        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:
@@ -70,12 +72,12 @@ static struct posix_acl *jfs_get_acl(struct inode *inode, int type)
                if (!IS_ERR(acl))
                        *p_acl = posix_acl_dup(acl);
        }
-       if (value)
-               kfree(value);
+       kfree(value);
        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);
@@ -89,11 +91,11 @@ static int jfs_set_acl(struct inode *inode, int type, struct posix_acl *acl)
 
        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:
-                       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;
@@ -102,7 +104,7 @@ static int jfs_set_acl(struct inode *inode, int type, struct posix_acl *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;
@@ -110,10 +112,9 @@ static int jfs_set_acl(struct inode *inode, int type, struct posix_acl *acl)
                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:
-       if (value)
-               kfree(value);
+       kfree(value);
 
        if (!rc) {
                if (*p_acl && (*p_acl != JFS_ACL_NOT_CACHED))
@@ -144,7 +145,7 @@ int jfs_permission(struct inode *inode, int mask, struct nameidata *nd)
        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;
@@ -160,7 +161,7 @@ int jfs_init_acl(struct inode *inode, struct inode *dir)
 
        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;
                }
@@ -174,13 +175,17 @@ int jfs_init_acl(struct inode *inode, struct inode *dir)
                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(acl);
        } else
                inode->i_mode &= ~current->fs->umask;
+       
+       JFS_IP(inode)->mode2 = (JFS_IP(inode)->mode2 & 0xffff0000) |
+                              inode->i_mode;
 
        return rc;
 }
@@ -203,8 +208,15 @@ static int jfs_acl_chmod(struct inode *inode)
                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);
+               mutex_lock(&JFS_IP(inode)->commit_mutex);
+               rc = jfs_set_acl(tid, inode, ACL_TYPE_ACCESS, clone);
+               if (!rc)
+                       rc = txCommit(tid, 1, &inode, 0);
+               txEnd(tid);
+               mutex_unlock(&JFS_IP(inode)->commit_mutex);
+       }
 
        posix_acl_release(clone);
        return rc;