summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-16 20:53:50 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-16 20:53:50 -0700
commite1e22b27ec6c83d026c2ca14624f207a08c28ec3 (patch)
tree236cdd292b02abbdeacee0fdb41012afe55f7ffb /fs
parentb62dabfb4b28a2d88deb4907ed0249da4d33d279 (diff)
parentdea5c24a14047b7d6b6b269434a85ffd05f1d2cb (diff)
downloadlinux-e1e22b27ec6c83d026c2ca14624f207a08c28ec3.tar.bz2
Merge tag 'driver-core-4.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull misc fixes from Greg KH: "Here are three small fixes for 4.6-rc4. Two fix up some lz4 issues with big endian systems, and the remaining one resolves a minor debugfs issue that was reported. All have been in linux-next with no reported issues" * tag 'driver-core-4.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: lib: lz4: cleanup unaligned access efficiency detection lib: lz4: fixed zram with lz4 on big endian machines debugfs: Make automount point inodes permanently empty
Diffstat (limited to 'fs')
-rw-r--r--fs/debugfs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index bece948b363d..8580831ed237 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -457,7 +457,7 @@ struct dentry *debugfs_create_automount(const char *name,
if (unlikely(!inode))
return failed_creating(dentry);
- inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
+ make_empty_dir_inode(inode);
inode->i_flags |= S_AUTOMOUNT;
inode->i_private = data;
dentry->d_fsdata = (void *)f;