summaryrefslogtreecommitdiff
path: root/fs/ext4/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/ext4/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/ext4/acl.c')
-rw-r--r--fs/ext4/acl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c
index 694ed6fadcc..647e0d65a28 100644
--- a/fs/ext4/acl.c
+++ b/fs/ext4/acl.c
@@ -323,7 +323,7 @@ ext4_init_acl(handle_t *handle, struct inode *inode, struct inode *dir)
return PTR_ERR(acl);
}
if (!acl)
- inode->i_mode &= ~current->fs->umask;
+ inode->i_mode &= ~current_umask();
}
if (test_opt(inode->i_sb, POSIX_ACL) && acl) {
struct posix_acl *clone;