From: Andreas Dilger <adilger@dilger.ca>
To: Theodore Ts'o <tytso@mit.edu>
Cc: Ext4 Developers List <linux-ext4@vger.kernel.org>, stable@kernel.org
Subject: Re: [PATCH] ext4: work around deleting a file with i_nlink == 0 safely
Date: Wed, 13 Nov 2019 14:25:28 -0700 [thread overview]
Message-ID: <30E5EDB7-7C38-4EBB-946A-E6C1E03AC80E@dilger.ca> (raw)
In-Reply-To: <20191112032903.8828-1-tytso@mit.edu>
[-- Attachment #1: Type: text/plain, Size: 2201 bytes --]
On Nov 11, 2019, at 8:29 PM, Theodore Ts'o <tytso@mit.edu> wrote:
>
> If the file system is corrupted such that a file's i_links_count is
> too small, then it's possible that when unlinking that file, i_nlink
> will already be zero. Previously we were working around this kind of
> corruption by forcing i_nlink to one; but we were doing this before
> trying to delete the directory entry --- and if the file system is
> corrupted enough that ext4_delete_entry() fails, then we exit with
> i_nlink elevated, and this causes the orphan inode list handling to be
> FUBAR'ed, such that when we unmount the file system, the orphan inode
> list can get corrupted.
>
> A better way to fix this is to simply skip trying to call drop_nlink()
> if i_nlink is already zero, thus moving the check to the place where
> it makes the most sense.
>
> https://bugzilla.kernel.org/show_bug.cgi?id=205433
>
> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
> Cc: stable@kernel.org
> ---
> fs/ext4/namei.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
> index a67cae3c8ff5..a856997d87b5 100644
> --- a/fs/ext4/namei.c
> +++ b/fs/ext4/namei.c
> @@ -3196,18 +3196,17 @@ static int ext4_unlink(struct inode *dir, struct dentry *dentry)
> if (IS_DIRSYNC(dir))
> ext4_handle_sync(handle);
>
> - if (inode->i_nlink == 0) {
> - ext4_warning_inode(inode, "Deleting file '%.*s' with no links",
> - dentry->d_name.len, dentry->d_name.name);
> - set_nlink(inode, 1);
> - }
> retval = ext4_delete_entry(handle, dir, de, bh);
> if (retval)
> goto end_unlink;
> dir->i_ctime = dir->i_mtime = current_time(dir);
> ext4_update_dx_flag(dir);
> ext4_mark_inode_dirty(handle, dir);
> - drop_nlink(inode);
> + if (inode->i_nlink == 0)
> + ext4_warning_inode(inode, "Deleting file '%.*s' with no links",
> + dentry->d_name.len, dentry->d_name.name);
> + else
> + drop_nlink(inode);
> if (!inode->i_nlink)
> ext4_orphan_add(handle, inode);
> inode->i_ctime = current_time(inode);
> --
> 2.23.0
>
Cheers, Andreas
[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 873 bytes --]
prev parent reply other threads:[~2019-11-13 21:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-12 3:29 [PATCH] ext4: work around deleting a file with i_nlink == 0 safely Theodore Ts'o
2019-11-13 21:25 ` Andreas Dilger [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=30E5EDB7-7C38-4EBB-946A-E6C1E03AC80E@dilger.ca \
--to=adilger@dilger.ca \
--cc=linux-ext4@vger.kernel.org \
--cc=stable@kernel.org \
--cc=tytso@mit.edu \
/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 NNTP newsgroup(s).