summaryrefslogtreecommitdiff
path: root/fs/jfs/acl.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-04-03 16:35:09 +0200
committerIngo Molnar <mingo@elte.hu>2009-04-03 16:35:09 +0200
commit484cad34dd667235565c14a40e2f5a8143184aaa (patch)
tree70bb901671958960a64d7f383c902178b4b49558 /fs/jfs/acl.c
parent95a38f34635bdf06089de763b4becbc957694977 (diff)
parent67796bf7dc54c035fd97f2681a72e5d2bf2a234a (diff)
Merge branch 'dma-debug' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
Diffstat (limited to 'fs/jfs/acl.c')
-rw-r--r--fs/jfs/acl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c
index a166c1669e8..06ca1b8d205 100644
--- a/fs/jfs/acl.c
+++ b/fs/jfs/acl.c
@@ -182,7 +182,7 @@ int jfs_init_acl(tid_t tid, struct inode *inode, struct inode *dir)
cleanup:
posix_acl_release(acl);
} else
- inode->i_mode &= ~current->fs->umask;
+ inode->i_mode &= ~current_umask();
JFS_IP(inode)->mode2 = (JFS_IP(inode)->mode2 & 0xffff0000) |
inode->i_mode;