From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-f170.google.com ([209.85.210.170]:38959 "EHLO mail-pf1-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727282AbeHWNwQ (ORCPT ); Thu, 23 Aug 2018 09:52:16 -0400 Received: by mail-pf1-f170.google.com with SMTP id j8-v6so2477678pff.6 for ; Thu, 23 Aug 2018 03:23:16 -0700 (PDT) Date: Thu, 23 Aug 2018 18:23:12 +0800 From: SZ Lin =?utf-8?B?KOael+S4iuaZuik=?= To: Greg Kroah-Hartman Cc: stable@vger.kernel.org, Vivek Goyal , Miklos Szeredi , SZ Lin =?utf-8?B?KOael+S4iuaZuik=?= Subject: request for 4.4-stable: e7c0b5991dd1b ("ovl: warn instead of error if d_type is not supported") Message-ID: <20180823102312.GB10325@localhost> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="7ZAtKRhVyVSsbBD2" Content-Disposition: inline Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: --7ZAtKRhVyVSsbBD2 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Hi Greg, This patch is not marked for 4.4-stable, but it's already in 4.9 and 4.14 stable. Please apply to 4.4-stable. This patch turned the status from error to warning if d_type is not supported, and thus operation won't be interrupted. -- SZ Lin (林上智) --7ZAtKRhVyVSsbBD2 Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename="0001-ovl-warn-instead-of-error-if-d_type-is-not-supported.patch" Content-Transfer-Encoding: 8bit >>From c80b678619de761d0c2060090fc00b3b32385476 Mon Sep 17 00:00:00 2001 From: Vivek Goyal Date: Fri, 1 Jul 2016 10:02:44 -0400 Subject: [PATCH] ovl: warn instead of error if d_type is not supported commit e7c0b5991dd1be7b6f6dc2b54a15a0f47b64b007 upstream overlay needs underlying fs to support d_type. Recently I put in a patch in to detect this condition and started failing mount if underlying fs did not support d_type. But this breaks existing configurations over kernel upgrade. Those who are running docker (partially broken configuration) with xfs not supporting d_type, are surprised that after kernel upgrade docker does not run anymore. https://github.com/docker/docker/issues/22937#issuecomment-229881315 So instead of erroring out, detect broken configuration and warn about it. This should allow existing docker setups to continue working after kernel upgrade. Signed-off-by: Vivek Goyal Signed-off-by: Miklos Szeredi Fixes: 45aebeaf4f67 ("ovl: Ensure upper filesystem supports d_type") Cc: 4.6 Signed-off-by: SZ Lin (林上智) --- fs/overlayfs/super.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index fd21c5f74fba..0035cb80ecd1 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -1066,11 +1066,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"); } } -- 2.18.0 --7ZAtKRhVyVSsbBD2--