X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fjfs%2Facl.c;h=5df55825aa95703fa340cf59df626bfe2dd8d6df;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=bc0135a9a222de401dab3d05a45cde9bb248691e;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c
index bc0135a9a..5df55825a 100644
--- a/fs/jfs/acl.c
+++ b/fs/jfs/acl.c
@@ -183,9 +183,6 @@ 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;
 }
@@ -210,12 +207,12 @@ static int jfs_acl_chmod(struct inode *inode)
 	rc = posix_acl_chmod_masq(clone, inode->i_mode);
 	if (!rc) {
 		tid_t tid = txBegin(inode->i_sb, 0);
-		mutex_lock(&JFS_IP(inode)->commit_mutex);
+		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);
-		mutex_unlock(&JFS_IP(inode)->commit_mutex);
+		up(&JFS_IP(inode)->commit_sem);
 	}
 
 	posix_acl_release(clone);