From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 06/10] xfs: report symlink block corruption errors to the health system
Date: Thu, 07 Nov 2019 23:06:05 -0800 [thread overview]
Message-ID: <157319676510.834783.10204474278449519548.stgit@magnolia> (raw)
In-Reply-To: <157319672612.834783.1318671695966912922.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
Whenever we encounter corrupt symbolic link blocks, we should report
that to the health monitoring system for later reporting.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
fs/xfs/xfs_iops.c | 5 ++++-
fs/xfs/xfs_symlink.c | 6 ++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 6e8eed4f4955..ce94ee0fe10a 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -21,6 +21,7 @@
#include "xfs_dir2.h"
#include "xfs_iomap.h"
#include "xfs_error.h"
+#include "xfs_health.h"
#include <linux/xattr.h>
#include <linux/posix_acl.h>
@@ -481,8 +482,10 @@ xfs_vn_get_link_inline(
* if_data is junk.
*/
link = ip->i_df.if_u1.if_data;
- if (XFS_IS_CORRUPT(ip->i_mount, !link))
+ if (XFS_IS_CORRUPT(ip->i_mount, !link)) {
+ xfs_inode_mark_sick(ip, XFS_SICK_INO_SYMLINK);
return ERR_PTR(-EFSCORRUPTED);
+ }
return link;
}
diff --git a/fs/xfs/xfs_symlink.c b/fs/xfs/xfs_symlink.c
index a25502bc2071..f5926985d24f 100644
--- a/fs/xfs/xfs_symlink.c
+++ b/fs/xfs/xfs_symlink.c
@@ -21,6 +21,7 @@
#include "xfs_trans_space.h"
#include "xfs_trace.h"
#include "xfs_trans.h"
+#include "xfs_health.h"
/* ----- Kernel only functions below ----- */
int
@@ -63,6 +64,8 @@ xfs_readlink_bmap_ilocked(
xfs_buf_relse(bp);
/* bad CRC means corrupted metadata */
+ if (xfs_metadata_is_sick(error))
+ xfs_inode_mark_sick(ip, XFS_SICK_INO_SYMLINK);
if (error == -EFSBADCRC)
error = -EFSCORRUPTED;
goto out;
@@ -75,6 +78,7 @@ xfs_readlink_bmap_ilocked(
if (xfs_sb_version_hascrc(&mp->m_sb)) {
if (!xfs_symlink_hdr_ok(ip->i_ino, offset,
byte_cnt, bp)) {
+ xfs_inode_mark_sick(ip, XFS_SICK_INO_SYMLINK);
error = -EFSCORRUPTED;
xfs_alert(mp,
"symlink header does not match required off/len/owner (0x%x/Ox%x,0x%llx)",
@@ -130,6 +134,7 @@ xfs_readlink(
__func__, (unsigned long long) ip->i_ino,
(long long) pathlen);
ASSERT(0);
+ xfs_inode_mark_sick(ip, XFS_SICK_INO_SYMLINK);
error = -EFSCORRUPTED;
goto out;
}
@@ -502,6 +507,7 @@ xfs_inactive_symlink(
__func__, (unsigned long long)ip->i_ino, pathlen);
xfs_iunlock(ip, XFS_ILOCK_EXCL);
ASSERT(0);
+ xfs_inode_mark_sick(ip, XFS_SICK_INO_SYMLINK);
return -EFSCORRUPTED;
}
next prev parent reply other threads:[~2019-11-08 7:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-08 7:05 [PATCH v3 00/10] xfs: report corruption to the health trackers Darrick J. Wong
2019-11-08 7:05 ` [PATCH 01/10] xfs: separate the marking of sick and checked metadata Darrick J. Wong
2019-11-08 7:05 ` [PATCH 02/10] xfs: report ag header corruption errors to the health tracking system Darrick J. Wong
2019-11-08 7:05 ` [PATCH 03/10] xfs: report block map " Darrick J. Wong
2019-11-08 7:05 ` [PATCH 04/10] xfs: report btree block corruption errors to the health system Darrick J. Wong
2019-11-08 7:05 ` [PATCH 05/10] xfs: report dir/attr " Darrick J. Wong
2019-11-08 7:06 ` Darrick J. Wong [this message]
2019-11-08 7:06 ` [PATCH 07/10] xfs: report inode " Darrick J. Wong
2019-11-08 7:06 ` [PATCH 08/10] xfs: report quota block " Darrick J. Wong
2019-11-08 7:06 ` [PATCH 09/10] xfs: report realtime metadata " Darrick J. Wong
2019-11-08 7:06 ` [PATCH 10/10] xfs: report XFS_IS_CORRUPT " Darrick J. Wong
-- strict thread matches above, loose matches on Subject: below --
2020-01-01 1:04 [PATCH 00/10] xfs: report corruption to the health trackers Darrick J. Wong
2020-01-01 1:05 ` [PATCH 06/10] xfs: report symlink block corruption errors to the health system Darrick J. Wong
2019-11-07 3:03 [PATCH 00/10] xfs: report corruption to the health trackers Darrick J. Wong
2019-11-07 3:03 ` [PATCH 06/10] xfs: report symlink block corruption errors to the health system Darrick J. Wong
2019-11-03 22:24 [PATCH 00/10] xfs: report corruption to the health trackers Darrick J. Wong
2019-11-03 22:25 ` [PATCH 06/10] xfs: report symlink block corruption errors to the health system Darrick J. Wong
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=157319676510.834783.10204474278449519548.stgit@magnolia \
--to=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
/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).