1 files changed, 77 insertions, 17 deletions

diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c
index 554ec739e49b..23aa5066b5a4 100644
--- a/fs/jfs/xattr.c
+++ b/fs/jfs/xattr.c
@@ -21,6 +21,7 @@
 #include <linux/xattr.h>
 #include <linux/posix_acl_xattr.h>
 #include <linux/quotaops.h>
+#include <linux/security.h>
 #include "jfs_incore.h"
 #include "jfs_superblock.h"
 #include "jfs_dmap.h"
@@ -633,12 +634,12 @@ static void ea_release(struct inode *inode, struct ea_buffer *ea_buf)
         }
 }
 
-static int ea_put(struct inode *inode, struct ea_buffer *ea_buf, int new_size)
+static int ea_put(tid_t tid, struct inode *inode, struct ea_buffer *ea_buf,
+                  int new_size)
 {
         struct jfs_inode_info *ji = JFS_IP(inode);
         unsigned long old_blocks, new_blocks;
         int rc = 0;
-        tid_t tid;
 
         if (new_size == 0) {
                 ea_release(inode, ea_buf);
@@ -664,9 +665,6 @@ static int ea_put(struct inode *inode, struct ea_buffer *ea_buf, int new_size)
         if (rc)
                 return rc;
 
-        tid = txBegin(inode->i_sb, 0);
-        down(&ji->commit_sem);
-
         old_blocks = new_blocks = 0;
 
         if (ji->ea.flag & DXD_EXTENT) {
@@ -695,11 +693,8 @@ static int ea_put(struct inode *inode, struct ea_buffer *ea_buf, int new_size)
                 DQUOT_FREE_BLOCK(inode, old_blocks);
 
         inode->i_ctime = CURRENT_TIME;
-        rc = txCommit(tid, 1, &inode, 0);
-        txEnd(tid);
-        up(&ji->commit_sem);
 
-        return rc;
+        return 0;
 }
 
 /*
@@ -810,8 +805,8 @@ static int can_set_xattr(struct inode *inode, const char *name,
         return permission(inode, MAY_WRITE, NULL);
 }
 
-int __jfs_setxattr(struct inode *inode, const char *name, const void *value,
-                   size_t value_len, int flags)
+int __jfs_setxattr(tid_t tid, struct inode *inode, const char *name,
+                   const void *value, size_t value_len, int flags)
 {
         struct jfs_ea_list *ealist;
         struct jfs_ea *ea, *old_ea = NULL, *next_ea = NULL;
@@ -825,9 +820,6 @@ int __jfs_setxattr(struct inode *inode, const char *name, const void *value,
         int rc;
         int length;
 
-        if ((rc = can_set_xattr(inode, name, value, value_len)))
-                return rc;
-
         if (strncmp(name, XATTR_OS2_PREFIX, XATTR_OS2_PREFIX_LEN) == 0) {
                 os2name = kmalloc(namelen - XATTR_OS2_PREFIX_LEN + 1,
                                   GFP_KERNEL);
@@ -939,7 +931,7 @@ int __jfs_setxattr(struct inode *inode, const char *name, const void *value,
 
         ealist->size = cpu_to_le32(new_size);
 
-        rc = ea_put(inode, &ea_buf, new_size);
+        rc = ea_put(tid, inode, &ea_buf, new_size);
 
         goto out;
       release:
@@ -955,12 +947,29 @@ int __jfs_setxattr(struct inode *inode, const char *name, const void *value,
 int jfs_setxattr(struct dentry *dentry, const char *name, const void *value,
                  size_t value_len, int flags)
 {
+        struct inode *inode = dentry->d_inode;
+        struct jfs_inode_info *ji = JFS_IP(inode);
+        int rc;
+        tid_t tid;
+
+        if ((rc = can_set_xattr(inode, name, value, value_len)))
+                return rc;
+
         if (value == NULL) {    /* empty EA, do not remove */
                 value = "";
                 value_len = 0;
         }
 
-        return __jfs_setxattr(dentry->d_inode, name, value, value_len, flags);
+        tid = txBegin(inode->i_sb, 0);
+        down(&ji->commit_sem);
+        rc = __jfs_setxattr(tid, dentry->d_inode, name, value, value_len,
+                            flags);
+        if (!rc)
+                rc = txCommit(tid, 1, &inode, 0);
+        txEnd(tid);
+        up(&ji->commit_sem);
+
+        return rc;
 }
 
 static int can_get_xattr(struct inode *inode, const char *name)
@@ -1122,5 +1131,56 @@ ssize_t jfs_listxattr(struct dentry * dentry, char *data, size_t buf_size)
 
 int jfs_removexattr(struct dentry *dentry, const char *name)
 {
-        return __jfs_setxattr(dentry->d_inode, name, NULL, 0, XATTR_REPLACE);
+        struct inode *inode = dentry->d_inode;
+        struct jfs_inode_info *ji = JFS_IP(inode);
+        int rc;
+        tid_t tid;
+
+        if ((rc = can_set_xattr(inode, name, NULL, 0)))
+                return rc;
+
+        tid = txBegin(inode->i_sb, 0);
+        down(&ji->commit_sem);
+        rc = __jfs_setxattr(tid, dentry->d_inode, name, NULL, 0, XATTR_REPLACE);
+        if (!rc)
+                rc = txCommit(tid, 1, &inode, 0);
+        txEnd(tid);
+        up(&ji->commit_sem);
+
+        return rc;
+}
+
+#ifdef CONFIG_JFS_SECURITY
+int jfs_init_security(tid_t tid, struct inode *inode, struct inode *dir)
+{
+        int rc;
+        size_t len;
+        void *value;
+        char *suffix;
+        char *name;
+
+        rc = security_inode_init_security(inode, dir, &suffix, &value, &len);
+        if (rc) {
+                if (rc == -EOPNOTSUPP)
+                        return 0;
+                return rc;
+        }
+        name = kmalloc(XATTR_SECURITY_PREFIX_LEN + 1 + strlen(suffix),
+                       GFP_NOFS);
+        if (!name) {
+                rc = -ENOMEM;
+                goto kmalloc_failed;
+        }
+        strcpy(name, XATTR_SECURITY_PREFIX);
+        strcpy(name + XATTR_SECURITY_PREFIX_LEN, suffix);
+
+        rc = __jfs_setxattr(tid, inode, name, value, len, 0);
+
+        kfree(name);
+kmalloc_failed:
+        kfree(suffix);
+        kfree(value);
+
+        return rc;
 }
+#endif