summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-05-16 16:33:59 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-05-16 16:33:59 -0700
commit92752b5cddcfe421767cf61151bf5a1553a6540b (patch)
tree2ec40ee20d4f5a906f83a5cb66e8ccd385d54d34 /fs
parent1630ee5e01c68ebee5e91da42a56f1865ffbfa1b (diff)
parenta718c92219b35e8a75175fde85c4566ac5730273 (diff)
downloadkernel-92752b5cddcfe421767cf61151bf5a1553a6540b.tar.gz
Merge branch 'for-linus-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML hostfs fix from Richard Weinberger: "This contains a single fix for a regression introduced in 4.1-rc1" * 'for-linus-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: hostfs: Use correct mask for file mode
Diffstat (limited to 'fs')
-rw-r--r--fs/hostfs/hostfs_kern.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index ef263174acd2..07d8d8f52faf 100644
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -581,7 +581,7 @@ static int hostfs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
if (name == NULL)
goto out_put;
- fd = file_create(name, mode & S_IFMT);
+ fd = file_create(name, mode & 0777);
if (fd < 0)
error = fd;
else