From patchwork Sat Dec 3 01:38:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 9486659 X-Mozilla-Keys: nonjunk Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on sandeen.net X-Spam-Level: X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD, UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 X-Spam-HP: BAYES_00=-1.9,HEADER_FROM_DIFFERENT_DOMAINS=0.001, RCVD_IN_DNSWL_HI=-5,RP_MATCHES_RCVD=-0.1,UNPARSEABLE_RELAY=0.001, URIBL_BLOCKED=0.001 X-Original-To: sandeen@sandeen.net Delivered-To: sandeen@sandeen.net Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by sandeen.net (Postfix) with ESMTP id 26B7A5FCC98 for ; Fri, 2 Dec 2016 19:38:46 -0600 (CST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755747AbcLCBjj (ORCPT ); Fri, 2 Dec 2016 20:39:39 -0500 Received: from userp1050.oracle.com ([156.151.31.82]:32162 "EHLO userp1050.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758775AbcLCBjd (ORCPT ); Fri, 2 Dec 2016 20:39:33 -0500 Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) by userp1050.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id uB31dG1p009282 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 3 Dec 2016 01:39:16 GMT Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id uB31c7Gj019739 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 3 Dec 2016 01:38:07 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.13.8/8.14.4) with ESMTP id uB31c6Og011808 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sat, 3 Dec 2016 01:38:07 GMT Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id uB31c6pj022620; Sat, 3 Dec 2016 01:38:06 GMT Received: from localhost (/24.21.211.40) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 02 Dec 2016 17:38:06 -0800 Subject: [PATCH 26/55] xfs: scrub inodes From: "Darrick J. Wong" To: david@fromorbit.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org Date: Fri, 02 Dec 2016 17:38:05 -0800 Message-ID: <148072908521.12995.6788205546348781541.stgit@birch.djwong.org> In-Reply-To: <148072891404.12995.15510849192837089093.stgit@birch.djwong.org> References: <148072891404.12995.15510849192837089093.stgit@birch.djwong.org> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Source-IP: userp1040.oracle.com [156.151.31.81] Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Scrub the fields within an inode. Signed-off-by: Darrick J. Wong --- fs/xfs/Makefile | 1 fs/xfs/libxfs/xfs_fs.h | 3 fs/xfs/libxfs/xfs_inode_buf.c | 2 fs/xfs/libxfs/xfs_inode_buf.h | 3 fs/xfs/repair/common.c | 121 ++++++++++++++++++- fs/xfs/repair/common.h | 1 fs/xfs/repair/inode.c | 266 +++++++++++++++++++++++++++++++++++++++++ fs/xfs/xfs_itable.c | 2 fs/xfs/xfs_itable.h | 5 + fs/xfs/xfs_trace.h | 3 10 files changed, 401 insertions(+), 6 deletions(-) create mode 100644 fs/xfs/repair/inode.c -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile index e81212a..a037d8e 100644 --- a/fs/xfs/Makefile +++ b/fs/xfs/Makefile @@ -108,6 +108,7 @@ xfs-$(CONFIG_XFS_ONLINE_REPAIR) += $(addprefix repair/, \ btree.o \ common.o \ ialloc.o \ + inode.o \ refcount.o \ rmap.o \ ) diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h index 559ee76..251db32 100644 --- a/fs/xfs/libxfs/xfs_fs.h +++ b/fs/xfs/libxfs/xfs_fs.h @@ -585,7 +585,8 @@ struct xfs_scrub_metadata { #define XFS_SCRUB_TYPE_FINOBT 8 /* free inode btree */ #define XFS_SCRUB_TYPE_RMAPBT 9 /* reverse mapping btree */ #define XFS_SCRUB_TYPE_REFCNTBT 10 /* reference count btree */ -#define XFS_SCRUB_TYPE_MAX 10 +#define XFS_SCRUB_TYPE_INODE 11 /* inode record */ +#define XFS_SCRUB_TYPE_MAX 11 #define XFS_SCRUB_FLAG_REPAIR 0x1 /* i: repair this metadata */ #define XFS_SCRUB_FLAG_CORRUPT 0x2 /* o: needs repair */ diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c index 60e3e6f..81fb626 100644 --- a/fs/xfs/libxfs/xfs_inode_buf.c +++ b/fs/xfs/libxfs/xfs_inode_buf.c @@ -380,7 +380,7 @@ xfs_log_dinode_to_disk( } } -static bool +bool xfs_dinode_verify( struct xfs_mount *mp, xfs_ino_t ino, diff --git a/fs/xfs/libxfs/xfs_inode_buf.h b/fs/xfs/libxfs/xfs_inode_buf.h index 6848a0a..988fd67 100644 --- a/fs/xfs/libxfs/xfs_inode_buf.h +++ b/fs/xfs/libxfs/xfs_inode_buf.h @@ -82,4 +82,7 @@ void xfs_inobp_check(struct xfs_mount *, struct xfs_buf *); #define xfs_inobp_check(mp, bp) #endif /* DEBUG */ +bool xfs_dinode_verify(struct xfs_mount *mp, xfs_ino_t ino, + struct xfs_dinode *dip); + #endif /* __XFS_INODE_BUF_H__ */ diff --git a/fs/xfs/repair/common.c b/fs/xfs/repair/common.c index a1bdf62..40d304d65 100644 --- a/fs/xfs/repair/common.c +++ b/fs/xfs/repair/common.c @@ -44,6 +44,8 @@ #include "xfs_rtalloc.h" #include "xfs_log.h" #include "xfs_trans_priv.h" +#include "xfs_icache.h" +#include "xfs_itable.h" #include "repair/xfs_scrub.h" #include "repair/common.h" #include "repair/btree.h" @@ -560,6 +562,7 @@ xfs_scrub_dummy( STATIC int xfs_scrub_teardown( struct xfs_scrub_context *sc, + struct xfs_inode *ip_in, int error) { xfs_scrub_ag_free(&sc->sa); @@ -568,6 +571,14 @@ xfs_scrub_teardown( sc->ag_lock.agmask = NULL; xfs_trans_cancel(sc->tp); sc->tp = NULL; + if (sc->ip != NULL) { + xfs_iunlock(sc->ip, XFS_ILOCK_EXCL); + xfs_iunlock(sc->ip, XFS_IOLOCK_EXCL); + xfs_iunlock(sc->ip, XFS_MMAPLOCK_EXCL); + if (sc->ip != ip_in) + IRELE(sc->ip); + sc->ip = NULL; + } return error; } @@ -685,6 +696,111 @@ xfs_scrub_setup_ag_header( return error; } +/* + * Given an inode and the scrub control structure, return either the + * inode referenced in the control structure or the inode passed in. + * The inode is not locked. + */ +STATIC struct xfs_inode * +xfs_scrub_get_inode( + struct xfs_scrub_context *sc, + struct xfs_inode *ip) +{ + struct xfs_mount *mp = ip->i_mount; + struct xfs_inode *ips = NULL; + int error; + + if (sc->sm->sm_gen && !sc->sm->sm_ino) + return ERR_PTR(-EINVAL); + + if (sc->sm->sm_ino && sc->sm->sm_ino != ip->i_ino) { + if (xfs_internal_inum(mp, sc->sm->sm_ino)) + return ERR_PTR(-ENOENT); + error = xfs_iget(mp, NULL, sc->sm->sm_ino, + XFS_IGET_UNTRUSTED | XFS_IGET_DONTCACHE, + 0, &ips); + if (error) { + trace_xfs_scrub_op_error(mp, + XFS_INO_TO_AGNO(mp, sc->sm->sm_ino), + XFS_INO_TO_AGBNO(mp, sc->sm->sm_ino), + "inode", error, __func__, __LINE__); + goto out_err; + } + if (VFS_I(ips)->i_generation != sc->sm->sm_gen) { + IRELE(ips); + return ERR_PTR(-ENOENT); + } + + return ips; + } + + return ip; +out_err: + return ERR_PTR(error); +} + +/* Set us up with an inode. */ +STATIC int +xfs_scrub_setup_inode( + struct xfs_scrub_context *sc, + struct xfs_inode *ip, + struct xfs_scrub_metadata *sm, + bool retry_deadlocked) +{ + struct xfs_mount *mp = ip->i_mount; + int error; + + memset(sc, 0, sizeof(*sc)); + sc->sm = sm; + sc->ip = xfs_scrub_get_inode(sc, ip); + if (IS_ERR(sc->ip)) + return PTR_ERR(sc->ip); + else if (sc->ip == NULL) + return -ENOENT; + + xfs_ilock(sc->ip, XFS_IOLOCK_EXCL); + xfs_ilock(sc->ip, XFS_MMAPLOCK_EXCL); + error = xfs_scrub_trans_alloc(sm, mp, &M_RES(mp)->tr_itruncate, + 0, 0, 0, &sc->tp); + if (error) + goto out_unlock; + xfs_ilock(sc->ip, XFS_ILOCK_EXCL); + + xfs_scrub_ag_lock_init(mp, &sc->ag_lock); + return error; +out_unlock: + xfs_iunlock(sc->ip, XFS_IOLOCK_EXCL); + xfs_iunlock(sc->ip, XFS_MMAPLOCK_EXCL); + if (sc->ip != ip) + IRELE(sc->ip); + return error; +} + +/* Try to get the in-core inode. If we can't, we'll just have to do it raw. */ +STATIC int +xfs_scrub_setup_inode_raw( + struct xfs_scrub_context *sc, + struct xfs_inode *ip, + struct xfs_scrub_metadata *sm, + bool retry_deadlocked) +{ + struct xfs_mount *mp = ip->i_mount; + int error; + + if (sm->sm_ino && xfs_internal_inum(mp, sm->sm_ino)) + return -ENOENT; + + error = xfs_scrub_setup_inode(sc, ip, sm, retry_deadlocked); + if (error) { + memset(sc, 0, sizeof(*sc)); + sc->ip = NULL; + sc->sm = sm; + return xfs_scrub_trans_alloc(sm, mp, + &M_RES(mp)->tr_itruncate, 0, 0, 0, &sc->tp); + } + return 0; +} + /* Scrubbing dispatch. */ struct xfs_scrub_meta_fns { @@ -707,6 +823,7 @@ static const struct xfs_scrub_meta_fns meta_scrub_fns[] = { {xfs_scrub_setup_ag_header, xfs_scrub_finobt, NULL, xfs_sb_version_hasfinobt}, {xfs_scrub_setup_ag_header, xfs_scrub_rmapbt, NULL, xfs_sb_version_hasrmapbt}, {xfs_scrub_setup_ag_header, xfs_scrub_refcountbt, NULL, xfs_sb_version_hasreflink}, + {xfs_scrub_setup_inode_raw, xfs_scrub_inode, NULL, NULL}, }; /* Dispatch metadata scrubbing. */ @@ -770,7 +887,7 @@ xfs_scrub_metadata( error = fns->scrub(&sc); if (!deadlocked && error == -EDEADLOCK) { deadlocked = true; - error = xfs_scrub_teardown(&sc, error); + error = xfs_scrub_teardown(&sc, ip, error); if (error != -EDEADLOCK) goto out; goto retry_op; @@ -781,7 +898,7 @@ xfs_scrub_metadata( xfs_alert_ratelimited(mp, "Corruption detected during scrub."); out_teardown: - error = xfs_scrub_teardown(&sc, error); + error = xfs_scrub_teardown(&sc, ip, error); out: trace_xfs_scrub_done(ip, sm->sm_type, sm->sm_agno, sm->sm_ino, sm->sm_gen, sm->sm_flags, error); diff --git a/fs/xfs/repair/common.h b/fs/xfs/repair/common.h index 3c24b58..223d245 100644 --- a/fs/xfs/repair/common.h +++ b/fs/xfs/repair/common.h @@ -204,5 +204,6 @@ int xfs_scrub_inobt(struct xfs_scrub_context *sc); int xfs_scrub_finobt(struct xfs_scrub_context *sc); int xfs_scrub_rmapbt(struct xfs_scrub_context *sc); int xfs_scrub_refcountbt(struct xfs_scrub_context *sc); +int xfs_scrub_inode(struct xfs_scrub_context *sc); #endif /* __XFS_REPAIR_COMMON_H__ */ diff --git a/fs/xfs/repair/inode.c b/fs/xfs/repair/inode.c new file mode 100644 index 0000000..b0786a2 --- /dev/null +++ b/fs/xfs/repair/inode.c @@ -0,0 +1,266 @@ +/* + * Copyright (C) 2016-2017 Oracle. All Rights Reserved. + * + * Author: Darrick J. Wong + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it would be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + */ +#include "xfs.h" +#include "xfs_fs.h" +#include "xfs_shared.h" +#include "xfs_format.h" +#include "xfs_trans_resv.h" +#include "xfs_mount.h" +#include "xfs_defer.h" +#include "xfs_btree.h" +#include "xfs_bit.h" +#include "xfs_log_format.h" +#include "xfs_trans.h" +#include "xfs_trace.h" +#include "xfs_sb.h" +#include "xfs_inode.h" +#include "xfs_icache.h" +#include "xfs_itable.h" +#include "xfs_inode_buf.h" +#include "xfs_inode_fork.h" +#include "xfs_ialloc.h" +#include "repair/common.h" + +/* Inode core */ + +#define XFS_SCRUB_INODE_CHECK(fs_ok) \ + XFS_SCRUB_INO_CHECK(sc, ino, bp, "inode", fs_ok); +#define XFS_SCRUB_INODE_GOTO(fs_ok, label) \ + XFS_SCRUB_INO_GOTO(sc, ino, bp, "inode", fs_ok, label); +#define XFS_SCRUB_INODE_OP_ERROR_GOTO(label) \ + XFS_SCRUB_OP_ERROR_GOTO(sc, XFS_INO_TO_AGNO(mp, ino), \ + XFS_INO_TO_AGBNO(mp, ino), "inode", &error, label); +#define XFS_SCRUB_INODE_PREEN(fs_ok) \ + XFS_SCRUB_INO_PREEN(sc, bp, "inode", fs_ok); +/* Scrub an inode. */ +int +xfs_scrub_inode( + struct xfs_scrub_context *sc) +{ + struct xfs_imap imap; + struct xfs_dinode di; + struct xfs_mount *mp = sc->tp->t_mountp; + struct xfs_ifork *ifp; + struct xfs_buf *bp = NULL; + struct xfs_dinode *dip; + xfs_ino_t ino; + unsigned long long isize; + uint64_t flags2; + uint32_t nextents; + uint32_t extsize; + uint32_t cowextsize; + uint16_t flags; + uint16_t mode; + int error = 0; + + /* Did we get the in-core inode, or are we doing this manually? */ + if (sc->ip) { + ino = sc->ip->i_ino; + xfs_inode_to_disk(sc->ip, &di, 0); + dip = &di; + } else { + /* Map & read inode. */ + ino = sc->sm->sm_ino; + error = xfs_imap(mp, sc->tp, ino, &imap, XFS_IGET_UNTRUSTED); + XFS_SCRUB_INODE_OP_ERROR_GOTO(out); + + error = xfs_trans_read_buf(mp, sc->tp, mp->m_ddev_targp, + imap.im_blkno, imap.im_len, XBF_UNMAPPED, &bp, + NULL); + XFS_SCRUB_INODE_OP_ERROR_GOTO(out); + + /* Is this really the inode we want? */ + bp->b_ops = &xfs_inode_buf_ops; + dip = xfs_buf_offset(bp, imap.im_boffset); + error = xfs_dinode_verify(mp, ino, dip) ? 0 : -EFSCORRUPTED; + XFS_SCRUB_INODE_OP_ERROR_GOTO(out); + XFS_SCRUB_INODE_GOTO( + xfs_dinode_good_version(mp, dip->di_version), + out); + if (be32_to_cpu(dip->di_gen) != sc->sm->sm_gen) { + error = -EINVAL; + goto out; + } + } + + flags = be16_to_cpu(dip->di_flags); + if (dip->di_version >= 3) + flags2 = be64_to_cpu(dip->di_flags2); + else + flags2 = 0; + + /* di_mode */ + mode = be16_to_cpu(dip->di_mode); + XFS_SCRUB_INODE_CHECK(!(mode & ~(S_IALLUGO | S_IFMT))); + + /* v1/v2 fields */ + switch (dip->di_version) { + case 1: + XFS_SCRUB_INODE_CHECK(dip->di_nlink == 0); + XFS_SCRUB_INODE_CHECK(dip->di_onlink > 0 || !sc->ip); + XFS_SCRUB_INODE_CHECK(dip->di_projid_lo == 0); + XFS_SCRUB_INODE_CHECK(dip->di_projid_hi == 0); + break; + case 2: + case 3: + XFS_SCRUB_INODE_CHECK(dip->di_onlink == 0); + XFS_SCRUB_INODE_CHECK(dip->di_nlink > 0 || !sc->ip); + XFS_SCRUB_INODE_CHECK(dip->di_projid_hi == 0 || + xfs_sb_version_hasprojid32bit(&mp->m_sb)); + break; + default: + ASSERT(0); + break; + } + + /* di_format */ + switch (dip->di_format) { + case XFS_DINODE_FMT_DEV: + XFS_SCRUB_INODE_CHECK(S_ISCHR(mode) || S_ISBLK(mode) || + S_ISFIFO(mode) || S_ISSOCK(mode)); + break; + case XFS_DINODE_FMT_LOCAL: + XFS_SCRUB_INODE_CHECK(S_ISDIR(mode) || S_ISLNK(mode)); + break; + case XFS_DINODE_FMT_EXTENTS: + XFS_SCRUB_INODE_CHECK(S_ISREG(mode) || S_ISDIR(mode) || + S_ISLNK(mode)); + break; + case XFS_DINODE_FMT_BTREE: + XFS_SCRUB_INODE_CHECK(S_ISREG(mode) || S_ISDIR(mode)); + break; + case XFS_DINODE_FMT_UUID: + default: + XFS_SCRUB_INODE_CHECK(false); + break; + } + + /* di_size */ + isize = be64_to_cpu(dip->di_size); + XFS_SCRUB_INODE_CHECK(!(isize & (1ULL << 63))); + if (!S_ISDIR(mode) && !S_ISREG(mode) && !S_ISLNK(mode)) + XFS_SCRUB_INODE_CHECK(isize == 0); + + /* di_nblocks */ + if (flags2 & XFS_DIFLAG2_REFLINK) { + ; /* nblocks can exceed dblocks */ + } else if (flags & XFS_DIFLAG_REALTIME) { + XFS_SCRUB_INODE_CHECK(be64_to_cpu(dip->di_nblocks) < + mp->m_sb.sb_dblocks + mp->m_sb.sb_rblocks); + } else { + XFS_SCRUB_INODE_CHECK(be64_to_cpu(dip->di_nblocks) < + mp->m_sb.sb_dblocks); + } + + /* di_extsize */ + if (flags & XFS_DIFLAG_EXTSIZE) { + extsize = be32_to_cpu(dip->di_extsize); + XFS_SCRUB_INODE_CHECK(extsize > 0); + XFS_SCRUB_INODE_CHECK(extsize <= MAXEXTLEN); + XFS_SCRUB_INODE_CHECK(extsize <= mp->m_sb.sb_agblocks / 2 || + (flags & XFS_DIFLAG_REALTIME)); + } + + /* di_flags */ + XFS_SCRUB_INODE_CHECK(!(flags & XFS_DIFLAG_IMMUTABLE) || + !(flags & XFS_DIFLAG_APPEND)); + + XFS_SCRUB_INODE_CHECK(!(flags & XFS_DIFLAG_FILESTREAM) || + !(flags & XFS_DIFLAG_REALTIME)); + + /* di_nextents */ + nextents = be32_to_cpu(dip->di_nextents); + switch (dip->di_format) { + case XFS_DINODE_FMT_EXTENTS: + XFS_SCRUB_INODE_CHECK(nextents <= + XFS_DFORK_DSIZE(dip, mp) / sizeof(struct xfs_bmbt_rec)); + break; + case XFS_DINODE_FMT_BTREE: + XFS_SCRUB_INODE_CHECK(nextents > + XFS_DFORK_DSIZE(dip, mp) / sizeof(struct xfs_bmbt_rec)); + break; + case XFS_DINODE_FMT_LOCAL: + case XFS_DINODE_FMT_DEV: + case XFS_DINODE_FMT_UUID: + default: + XFS_SCRUB_INODE_CHECK(nextents == 0); + break; + } + + /* di_anextents */ + nextents = be16_to_cpu(dip->di_anextents); + switch (dip->di_aformat) { + case XFS_DINODE_FMT_EXTENTS: + XFS_SCRUB_INODE_CHECK(nextents <= + XFS_DFORK_ASIZE(dip, mp) / sizeof(struct xfs_bmbt_rec)); + break; + case XFS_DINODE_FMT_BTREE: + XFS_SCRUB_INODE_CHECK(nextents > + XFS_DFORK_ASIZE(dip, mp) / sizeof(struct xfs_bmbt_rec)); + break; + case XFS_DINODE_FMT_LOCAL: + case XFS_DINODE_FMT_DEV: + case XFS_DINODE_FMT_UUID: + default: + XFS_SCRUB_INODE_CHECK(nextents == 0); + break; + } + + /* di_forkoff */ + XFS_SCRUB_INODE_CHECK(XFS_DFORK_APTR(dip) < + (char *)dip + mp->m_sb.sb_inodesize); + XFS_SCRUB_INODE_CHECK(dip->di_anextents == 0 || dip->di_forkoff); + + /* di_aformat */ + XFS_SCRUB_INODE_CHECK(dip->di_aformat == XFS_DINODE_FMT_LOCAL || + dip->di_aformat == XFS_DINODE_FMT_EXTENTS || + dip->di_aformat == XFS_DINODE_FMT_BTREE); + + /* di_cowextsize */ + if (flags2 & XFS_DIFLAG2_COWEXTSIZE) { + cowextsize = be32_to_cpu(dip->di_cowextsize); + XFS_SCRUB_INODE_CHECK(xfs_sb_version_hasreflink(&mp->m_sb)); + XFS_SCRUB_INODE_CHECK(cowextsize > 0); + XFS_SCRUB_INODE_CHECK(cowextsize <= MAXEXTLEN); + XFS_SCRUB_INODE_CHECK(cowextsize <= mp->m_sb.sb_agblocks / 2); + } + + /* Now let's do the things that require a live inode. */ + if (!sc->ip) + goto out; + + /* + * If this is a reflink inode with no CoW in progress, maybe we + * can turn off the reflink flag? + */ + if (xfs_is_reflink_inode(sc->ip)) { + ifp = XFS_IFORK_PTR(sc->ip, XFS_COW_FORK); + XFS_SCRUB_INODE_PREEN(ifp->if_bytes > 0); + } + +out: + if (bp) + xfs_trans_brelse(sc->tp, bp); + return error; +} +#undef XFS_SCRUB_INODE_PREEN +#undef XFS_SCRUB_INODE_OP_ERROR_GOTO +#undef XFS_SCRUB_INODE_GOTO +#undef XFS_SCRUB_INODE_CHECK diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c index 66e8817..4fd5fe1 100644 --- a/fs/xfs/xfs_itable.c +++ b/fs/xfs/xfs_itable.c @@ -31,7 +31,7 @@ #include "xfs_trace.h" #include "xfs_icache.h" -STATIC int +int xfs_internal_inum( xfs_mount_t *mp, xfs_ino_t ino) diff --git a/fs/xfs/xfs_itable.h b/fs/xfs/xfs_itable.h index 6ea8b39..dd2427b 100644 --- a/fs/xfs/xfs_itable.h +++ b/fs/xfs/xfs_itable.h @@ -96,4 +96,9 @@ xfs_inumbers( void __user *buffer, /* buffer with inode info */ inumbers_fmt_pf formatter); +int +xfs_internal_inum( + xfs_mount_t *mp, + xfs_ino_t ino); + #endif /* __XFS_ITABLE_H__ */ diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h index 4e27db0..5314fca 100644 --- a/fs/xfs/xfs_trace.h +++ b/fs/xfs/xfs_trace.h @@ -3472,7 +3472,8 @@ DEFINE_GETFSMAP_EVENT(xfs_getfsmap_mapping); { XFS_SCRUB_TYPE_INOBT, "inobt" }, \ { XFS_SCRUB_TYPE_FINOBT, "finobt" }, \ { XFS_SCRUB_TYPE_RMAPBT, "rmapbt" }, \ - { XFS_SCRUB_TYPE_REFCNTBT, "refcountbt" } + { XFS_SCRUB_TYPE_REFCNTBT, "refcountbt" }, \ + { XFS_SCRUB_TYPE_INODE, "inode" } DECLARE_EVENT_CLASS(xfs_scrub_class, TP_PROTO(struct xfs_inode *ip, int type, xfs_agnumber_t agno, xfs_ino_t inum, unsigned int gen, unsigned int flags,