diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-19 04:28:28 +0900 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-19 04:28:28 +0900 |
commit | 5614e7725856ea383f458377980298111439e0fb (patch) | |
tree | 82560034c3a17ee18073420406ba1228935e2967 /fs/debugfs/inode.c | |
parent | 522566376a3f8373fbd5ff75bb8a7a2da701c1a7 (diff) | |
parent | c3b46c73264b03000d1e18b22f5caf63332547c9 (diff) | |
download | linux-5614e7725856ea383f458377980298111439e0fb.tar.gz linux-5614e7725856ea383f458377980298111439e0fb.tar.bz2 linux-5614e7725856ea383f458377980298111439e0fb.zip |
Merge 4.6-rc4 into driver-core-next
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/debugfs/inode.c')
-rw-r--r-- | fs/debugfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index 41e079a8da26..4bc1f68243c1 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c @@ -517,7 +517,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; |