From: David Sterba <dsterba@suse.cz>
To: Nikolay Borisov <nborisov@suse.com>
Cc: linux-btrfs@vger.kernel.org
Subject: Re: [PATCH 1/1] btrfs: Track subdirectories in nlink
Date: Mon, 31 Aug 2020 15:27:36 +0200 [thread overview]
Message-ID: <20200831132735.GY28318@twin.jikos.cz> (raw)
In-Reply-To: <20200827150426.23842-3-nborisov@suse.com>
On Thu, Aug 27, 2020 at 06:04:25PM +0300, Nikolay Borisov wrote:
> This adds the necessary calls to inc_nlink so that the number of
> subdirectories are accounted for in the i_nlink count of a directory. It
> works also for subvolumes and snapshots. Unfortunately the state of the
> on-disk i_nlink is codified in the tree checker so I had to remove the
> check but such filesystems will refuse to mount on older kernels.
Not refusing to mount but it would return EUCLEAN when accessing the
directory and probably turning the fs to read-only, aborting any
running transactions on the way.
> Signed-off-by: Nikolay Borisov <nborisov@suse.com>
> ---
> fs/btrfs/inode.c | 13 +++++++++++--
> fs/btrfs/ioctl.c | 10 +++++++---
> fs/btrfs/transaction.c | 12 ++++++++----
> fs/btrfs/tree-checker.c | 7 +------
> 4 files changed, 27 insertions(+), 15 deletions(-)
>
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index 40fed3285f62..e82eb501fe0d 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -3635,6 +3635,8 @@ static int __btrfs_unlink_inode(struct btrfs_trans_handle *trans,
> inode_inc_iversion(&dir->vfs_inode);
> inode->vfs_inode.i_ctime = dir->vfs_inode.i_mtime =
> dir->vfs_inode.i_ctime = current_time(&inode->vfs_inode);
> + if (S_ISDIR(inode->vfs_inode.i_mode))
> + drop_nlink(&dir->vfs_inode);
This should not be unconditional, only decrease links if it's not 1,
similarly the inc_nlink calls.
next prev parent reply other threads:[~2020-08-31 13:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-27 15:04 [PATCH 0/1 NOT FOR MERGE] Basic subdir tracking in nlink Nikolay Borisov
2020-08-27 15:04 ` [PATCH] btrfs/218: Test for i_nlink tracking Nikolay Borisov
2020-08-27 15:04 ` [PATCH 1/1] btrfs: Track subdirectories in nlink Nikolay Borisov
2020-08-31 13:27 ` David Sterba [this message]
2020-08-27 15:04 ` [PATCH] btrfs-progs: check: Support precise nlink tracking Nikolay Borisov
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=20200831132735.GY28318@twin.jikos.cz \
--to=dsterba@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
--cc=nborisov@suse.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 NNTP newsgroup(s).