From: <cheng.lin130@zte.com.cn>
To: <djwong@kernel.org>
Cc: <linux-xfs@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<jiang.yong5@zte.com.cn>, <wang.liang82@zte.com.cn>,
<liu.dong3@zte.com.cn>
Subject: [PATCH] xfs: introduce protection for drop nlink
Date: Thu, 24 Aug 2023 15:43:52 +0800 (CST) [thread overview]
Message-ID: <202308241543526473806@zte.com.cn> (raw)
From: Cheng Lin <cheng.lin130@zte.com.cn>
An dir nlinks overflow which down form 0 to 0xffffffff, cause the
directory to become unusable until the next xfs_repair run.
Introduce protection for drop nlink to reduce the impact of this.
And produce a warning for directory nlink error during remove.
Signed-off-by: Cheng Lin <cheng.lin130@zte.com.cn>
---
fs/xfs/xfs_inode.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 9e62cc5..536dbe4 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -919,6 +919,15 @@ STATIC int xfs_iunlink_remove(struct xfs_trans *tp, struct xfs_perag *pag,
xfs_trans_t *tp,
xfs_inode_t *ip)
{
+ xfs_mount_t *mp;
+
+ if (VFS_I(ip)->i_nlink == 0) {
+ mp = ip->i_mount;
+ xfs_warn(mp, "%s: Deleting inode %llu with no links.",
+ __func__, ip->i_ino);
+ return 0;
+ }
+
xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG);
drop_nlink(VFS_I(ip));
@@ -2442,7 +2451,12 @@ STATIC int xfs_iunlink_remove(struct xfs_trans *tp, struct xfs_perag *pag,
*/
if (is_dir) {
ASSERT(VFS_I(ip)->i_nlink >= 2);
- if (VFS_I(ip)->i_nlink != 2) {
+ if (VFS_I(ip)->i_nlink < 2) {
+ xfs_warn(ip->i_mount,
+ "%s: Remove dir (inode %llu) with invalid links.",
+ __func__, ip->i_ino);
+ }
+ if (VFS_I(ip)->i_nlink > 2) {
error = -ENOTEMPTY;
goto out_trans_cancel;
}
--
1.8.3.1
next reply other threads:[~2023-08-24 7:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-24 7:43 cheng.lin130 [this message]
2023-08-24 16:12 ` [PATCH] xfs: introduce protection for drop nlink Darrick J. Wong
2023-08-25 8:32 ` cheng.lin130
2023-08-25 18:02 ` Darrick J. Wong
2023-08-26 14:54 ` cheng.lin130
2023-08-26 21:28 ` Dave Chinner
2023-08-28 3:29 ` cheng.lin130
2023-08-28 5:21 ` Dave Chinner
[not found] ` <202309041042177773780@zte.com.cn>
2023-09-04 22:49 ` Dave Chinner
2023-08-24 23:02 ` Dave Chinner
2023-08-25 9:09 ` cheng.lin130
2023-08-25 17:56 ` Darrick J. Wong
2023-08-26 3:08 ` Dave Chinner
2023-08-26 15:08 ` cheng.lin130
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=202308241543526473806@zte.com.cn \
--to=cheng.lin130@zte.com.cn \
--cc=djwong@kernel.org \
--cc=jiang.yong5@zte.com.cn \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=liu.dong3@zte.com.cn \
--cc=wang.liang82@zte.com.cn \
/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).