diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 04:21:33 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 04:21:33 -0400 |
| commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
| tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /ipc/mqueue.c | |
| parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'ipc/mqueue.c')
| -rw-r--r-- | ipc/mqueue.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 3a926011507b..a0f18c9cc89d 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c | |||
| @@ -611,6 +611,7 @@ static struct file *do_create(struct dentry *dir, struct dentry *dentry, | |||
| 611 | dentry->d_fsdata = &attr; | 611 | dentry->d_fsdata = &attr; |
| 612 | } | 612 | } |
| 613 | 613 | ||
| 614 | mode &= ~current->fs->umask; | ||
| 614 | ret = vfs_create(dir->d_inode, dentry, mode, NULL); | 615 | ret = vfs_create(dir->d_inode, dentry, mode, NULL); |
| 615 | dentry->d_fsdata = NULL; | 616 | dentry->d_fsdata = NULL; |
| 616 | if (ret) | 617 | if (ret) |