Commit 92752b5c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1630ee5e a718c922
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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