summaryrefslogtreecommitdiffstats
path: root/fs/hostfs/hostfs_kern.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-06-05 22:25:01 +0200
committerThomas Gleixner <tglx@linutronix.de>2015-06-05 22:25:01 +0200
commit9f61f62544747db5d5c590bfae9dd19f1337e421 (patch)
tree74772cccd14e7ab6d01a3452d4030cd7f8e58ccb /fs/hostfs/hostfs_kern.c
parentde8d1810fda5463ee60ba2937ca68e55a52bd9e7 (diff)
parent086e8ddb567951513a5dace21a09297768aee14f (diff)
downloadlinux-9f61f62544747db5d5c590bfae9dd19f1337e421.tar.bz2
Merge branch 'linus' into irq/core
Get the urgent fixes from upstream to avoid conflicts.
Diffstat (limited to 'fs/hostfs/hostfs_kern.c')
-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