diff options
author | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2009-04-03 05:29:05 -0400 |
commit | 65127d28e312bb6b38ce84a7bb71d762ef63ad4c (patch) | |
tree | d5fdf52a2d0731f7fab0ce0ed394faac50b04fbc /ipc/mqueue.c | |
parent | b8bb76713ec50df2f11efee386e16f93d51e1076 (diff) | |
parent | 8fe74cf053de7ad2124a894996f84fa890a81093 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge
Diffstat (limited to 'ipc/mqueue.c')
-rw-r--r-- | ipc/mqueue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index a8ddadbc7459..916785363f0f 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c | |||
@@ -602,7 +602,7 @@ static struct file *do_create(struct dentry *dir, struct dentry *dentry, | |||
602 | dentry->d_fsdata = attr; | 602 | dentry->d_fsdata = attr; |
603 | } | 603 | } |
604 | 604 | ||
605 | mode &= ~current->fs->umask; | 605 | mode &= ~current_umask(); |
606 | ret = mnt_want_write(mqueue_mnt); | 606 | ret = mnt_want_write(mqueue_mnt); |
607 | if (ret) | 607 | if (ret) |
608 | goto out; | 608 | goto out; |