summaryrefslogtreecommitdiffstats
path: root/fs/overlayfs/super.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-07-07 10:35:28 +0200
committerIngo Molnar <mingo@kernel.org>2016-07-07 10:35:28 +0200
commit4b4b20852d1009c5e8bc357b22353b62e3a241c7 (patch)
tree1026418471fe10c5b9f2fdff8a6b49bf070938fc /fs/overlayfs/super.c
parent5130213721d01b6632c255d4295a8102cbb58379 (diff)
parentf00c0afdfa625165a609513bc74164d56752ec3e (diff)
downloadlinux-4b4b20852d1009c5e8bc357b22353b62e3a241c7.tar.gz
linux-4b4b20852d1009c5e8bc357b22353b62e3a241c7.tar.bz2
linux-4b4b20852d1009c5e8bc357b22353b62e3a241c7.zip
Merge branch 'timers/fast-wheel' into timers/core
Diffstat (limited to 'fs/overlayfs/super.c')
-rw-r--r--fs/overlayfs/super.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index ce02f46029da..9a7693d5f8ff 100644
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -1082,11 +1082,13 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
if (err < 0)
goto out_put_workdir;
- if (!err) {
- pr_err("overlayfs: upper fs needs to support d_type.\n");
- err = -EINVAL;
- goto out_put_workdir;
- }
+ /*
+ * We allowed this configuration and don't want to
+ * break users over kernel upgrade. So warn instead
+ * of erroring out.
+ */
+ if (!err)
+ pr_warn("overlayfs: upper fs needs to support d_type.\n");
}
}