diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-11-04 10:01:20 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-11-04 10:01:20 -0800 |
| commit | 49bd04cb11e57c4cd4d2c00feca898537dd6db1f (patch) | |
| tree | 846c594b2b1d2f203c24ff32569b6c615822a5dc /fs/overlayfs/super.c | |
| parent | 260409578ecbf7ce1725b85f9c082312bff808c0 (diff) | |
| parent | 12ba397b828b7e7f5d28a73e9a2ee14470b7edc7 (diff) | |
Merge tag 'v4.1.12-rt12' of git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel into v4.1/topic/rt
v4.1.12-rt12
Diffstat (limited to 'fs/overlayfs/super.c')
| -rw-r--r-- | fs/overlayfs/super.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index bf8537c7f455..33f2d27a6792 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -275,6 +275,7 @@ static void ovl_dentry_release(struct dentry *dentry) static const struct dentry_operations ovl_dentry_operations = { .d_release = ovl_dentry_release, + .d_select_inode = ovl_d_select_inode, }; static struct ovl_entry *ovl_alloc_entry(unsigned int numlower) @@ -517,10 +518,10 @@ static int ovl_show_options(struct seq_file *m, struct dentry *dentry) struct super_block *sb = dentry->d_sb; struct ovl_fs *ufs = sb->s_fs_info; - seq_printf(m, ",lowerdir=%s", ufs->config.lowerdir); + seq_show_option(m, "lowerdir", ufs->config.lowerdir); if (ufs->config.upperdir) { - seq_printf(m, ",upperdir=%s", ufs->config.upperdir); - seq_printf(m, ",workdir=%s", ufs->config.workdir); + seq_show_option(m, "upperdir", ufs->config.upperdir); + seq_show_option(m, "workdir", ufs->config.workdir); } return 0; } |