1 files changed, 64 insertions, 21 deletions

diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index 49ccde3937f9..1abe7343f920 100644
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -39,6 +39,24 @@ struct dentry_operations jfs_ci_dentry_operations;
 static s64 commitZeroLink(tid_t, struct inode *);
 
 /*
+ * NAME:        free_ea_wmap(inode)
+ *
+ * FUNCTION:    free uncommitted extended attributes from working map 
+ *
+ */
+static inline void free_ea_wmap(struct inode *inode)
+{
+        dxd_t *ea = &JFS_IP(inode)->ea;
+
+        if (ea->flag & DXD_EXTENT) {
+                /* free EA pages from cache */
+                invalidate_dxd_metapages(inode, *ea);
+                dbFree(inode, addressDXD(ea), lengthDXD(ea));
+        }
+        ea->flag = 0;
+}
+
+/*
  * NAME:        jfs_create(dip, dentry, mode)
  *
  * FUNCTION:    create a regular file in the parent directory <dip>
@@ -89,8 +107,19 @@ static int jfs_create(struct inode *dip, struct dentry *dentry, int mode,
         down(&JFS_IP(dip)->commit_sem);
         down(&JFS_IP(ip)->commit_sem);
 
+        rc = jfs_init_acl(tid, ip, dip);
+        if (rc)
+                goto out3;
+
+        rc = jfs_init_security(tid, ip, dip);
+        if (rc) {
+                txAbort(tid, 0);
+                goto out3;
+        }
+
         if ((rc = dtSearch(dip, &dname, &ino, &btstack, JFS_CREATE))) {
                 jfs_err("jfs_create: dtSearch returned %d", rc);
+                txAbort(tid, 0);
                 goto out3;
         }
 
@@ -139,6 +168,7 @@ static int jfs_create(struct inode *dip, struct dentry *dentry, int mode,
         up(&JFS_IP(dip)->commit_sem);
         up(&JFS_IP(ip)->commit_sem);
         if (rc) {
+                free_ea_wmap(ip);
                 ip->i_nlink = 0;
                 iput(ip);
         } else
@@ -147,11 +177,6 @@ static int jfs_create(struct inode *dip, struct dentry *dentry, int mode,
       out2:
         free_UCSname(&dname);
 
-#ifdef CONFIG_JFS_POSIX_ACL
-        if (rc == 0)
-                jfs_init_acl(ip, dip);
-#endif
-
       out1:
 
         jfs_info("jfs_create: rc:%d", rc);
@@ -216,8 +241,19 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, int mode)
         down(&JFS_IP(dip)->commit_sem);
         down(&JFS_IP(ip)->commit_sem);
 
+        rc = jfs_init_acl(tid, ip, dip);
+        if (rc)
+                goto out3;
+
+        rc = jfs_init_security(tid, ip, dip);
+        if (rc) {
+                txAbort(tid, 0);
+                goto out3;
+        }
+
         if ((rc = dtSearch(dip, &dname, &ino, &btstack, JFS_CREATE))) {
                 jfs_err("jfs_mkdir: dtSearch returned %d", rc);
+                txAbort(tid, 0);
                 goto out3;
         }
 
@@ -267,6 +303,7 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, int mode)
         up(&JFS_IP(dip)->commit_sem);
         up(&JFS_IP(ip)->commit_sem);
         if (rc) {
+                free_ea_wmap(ip);
                 ip->i_nlink = 0;
                 iput(ip);
         } else
@@ -275,10 +312,6 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, int mode)
       out2:
         free_UCSname(&dname);
 
-#ifdef CONFIG_JFS_POSIX_ACL
-        if (rc == 0)
-                jfs_init_acl(ip, dip);
-#endif
 
       out1:
 
@@ -885,6 +918,10 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
         down(&JFS_IP(dip)->commit_sem);
         down(&JFS_IP(ip)->commit_sem);
 
+        rc = jfs_init_security(tid, ip, dip);
+        if (rc)
+                goto out3;
+
         tblk = tid_to_tblock(tid);
         tblk->xflag |= COMMIT_CREATE;
         tblk->ino = ip->i_ino;
@@ -1000,6 +1037,7 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
         up(&JFS_IP(dip)->commit_sem);
         up(&JFS_IP(ip)->commit_sem);
         if (rc) {
+                free_ea_wmap(ip);
                 ip->i_nlink = 0;
                 iput(ip);
         } else
@@ -1008,11 +1046,6 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
       out2:
         free_UCSname(&dname);
 
-#ifdef CONFIG_JFS_POSIX_ACL
-        if (rc == 0)
-                jfs_init_acl(ip, dip);
-#endif
-
       out1:
         jfs_info("jfs_symlink: rc:%d", rc);
         return rc;
@@ -1328,8 +1361,20 @@ static int jfs_mknod(struct inode *dir, struct dentry *dentry,
         down(&JFS_IP(dir)->commit_sem);
         down(&JFS_IP(ip)->commit_sem);
 
-        if ((rc = dtSearch(dir, &dname, &ino, &btstack, JFS_CREATE)))
+        rc = jfs_init_acl(tid, ip, dir);
+        if (rc)
+                goto out3;
+
+        rc = jfs_init_security(tid, ip, dir);
+        if (rc) {
+                txAbort(tid, 0);
                 goto out3;
+        }
+
+        if ((rc = dtSearch(dir, &dname, &ino, &btstack, JFS_CREATE))) {
+                txAbort(tid, 0);
+                goto out3;
+        }
 
         tblk = tid_to_tblock(tid);
         tblk->xflag |= COMMIT_CREATE;
@@ -1337,8 +1382,10 @@ static int jfs_mknod(struct inode *dir, struct dentry *dentry,
         tblk->u.ixpxd = JFS_IP(ip)->ixpxd;
 
         ino = ip->i_ino;
-        if ((rc = dtInsert(tid, dir, &dname, &ino, &btstack)))
+        if ((rc = dtInsert(tid, dir, &dname, &ino, &btstack))) {
+                txAbort(tid, 0);
                 goto out3;
+        }
 
         ip->i_op = &jfs_file_inode_operations;
         jfs_ip->dev = new_encode_dev(rdev);
@@ -1360,6 +1407,7 @@ static int jfs_mknod(struct inode *dir, struct dentry *dentry,
         up(&JFS_IP(ip)->commit_sem);
         up(&JFS_IP(dir)->commit_sem);
         if (rc) {
+                free_ea_wmap(ip);
                 ip->i_nlink = 0;
                 iput(ip);
         } else
@@ -1368,11 +1416,6 @@ static int jfs_mknod(struct inode *dir, struct dentry *dentry,
       out1:
         free_UCSname(&dname);
 
-#ifdef CONFIG_JFS_POSIX_ACL
-        if (rc == 0)
-                jfs_init_acl(ip, dir);
-#endif
-
       out:
         jfs_info("jfs_mknod: returning %d", rc);
         return rc;