From: Amir Goldstein <amir73il@gmail.com>
To: Yunlong Xing <yunlong.xing@unisoc.com>
Cc: miklos@szeredi.hu, linux-unionfs@vger.kernel.org,
linux-kernel@vger.kernel.org, stable@vger.kernel.org,
gregkh@linuxfoundation.org, sashal@kernel.org,
yunlongxing23@gmail.com, zhiguo.niu@unisoc.com,
hongyu.jin@unisoc.com
Subject: Re: [PATCH] ovl: fix mount fail because the upper doesn't have space
Date: Tue, 18 Jul 2023 14:37:48 +0300 [thread overview]
Message-ID: <CAOQ4uxgLhf8EyticTQUxtzUdVD=UEUTwQnTkujXE1KuaVxNQyQ@mail.gmail.com> (raw)
In-Reply-To: <1689669277-15291-1-git-send-email-yunlong.xing@unisoc.com>
On Tue, Jul 18, 2023 at 11:35 AM Yunlong Xing <yunlong.xing@unisoc.com> wrote:
>
> The current ovlfs mount flow:
>
> ovl_fill_super
> |_ovl_get_workdir
> |_ovl_make_workdir
> |_ovl_check_rename_whiteout
>
> In ovl_check_rename_whiteout(), a new file is attempted to create.But if
> the upper doesn't have space to do this, it will return error -ENOSPC,
> causing the mount fail. It means that if the upper is full, the overlayfs
> cannot be mounted.It is not reasonable, so this patch will omit this error
> and continue mount flow.
>
> Fixes: cad218ab3320 ("ovl: check if upper fs supports RENAME_WHITEOUT")
> Signed-off-by: Yunlong Xing <yunlong.xing@unisoc.com>
> ---
> fs/overlayfs/super.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
> index 5b069f1a1e44..2cf41e978cff 100644
> --- a/fs/overlayfs/super.c
> +++ b/fs/overlayfs/super.c
> @@ -744,9 +744,12 @@ static int ovl_make_workdir(struct super_block *sb, struct ovl_fs *ofs,
>
> /* Check if upper/work fs supports RENAME_WHITEOUT */
> err = ovl_check_rename_whiteout(ofs);
> - if (err < 0)
> - goto out;
> -
> + if (err < 0) {
> + if (err == -ENOSPC)
> + pr_warn("upper fs check RENAME_WHITEOUT fail due to no space.\n");
> + else
> + goto out;
> + }
> rename_whiteout = err;
> if (!rename_whiteout)
> pr_warn("upper fs does not support RENAME_WHITEOUT.\n");
> --
This assumes that RENAME_WHITEOUT is supported.
I rather assume it is not supported if the check fails.
Like this is shorter (not tested):
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -744,12 +744,13 @@ static int ovl_make_workdir(struct super_block
*sb, struct ovl_fs *ofs,
/* Check if upper/work fs supports RENAME_WHITEOUT */
err = ovl_check_rename_whiteout(ofs);
- if (err < 0)
+ if (err < 0 && err != -ENOSPC)
goto out;
- rename_whiteout = err;
+ rename_whiteout = err > 0;
if (!rename_whiteout)
- pr_warn("upper fs does not support RENAME_WHITEOUT.\n");
+ pr_warn("upper fs does not support RENAME_WHITEOUT (%i).\n",
+ err);
Thanks,
Amir.
prev parent reply other threads:[~2023-07-18 11:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-18 8:34 [PATCH] ovl: fix mount fail because the upper doesn't have space Yunlong Xing
2023-07-18 11:37 ` Amir Goldstein [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAOQ4uxgLhf8EyticTQUxtzUdVD=UEUTwQnTkujXE1KuaVxNQyQ@mail.gmail.com' \
--to=amir73il@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hongyu.jin@unisoc.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
--cc=yunlong.xing@unisoc.com \
--cc=yunlongxing23@gmail.com \
--cc=zhiguo.niu@unisoc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).