From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from userp1040.oracle.com ([156.151.31.81]:51643 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934482AbdCJXVO (ORCPT ); Fri, 10 Mar 2017 18:21:14 -0500 Subject: [PATCH 12/19] xfs: scrub inodes From: "Darrick J. Wong" To: darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Date: Fri, 10 Mar 2017 15:21:04 -0800 Message-ID: <148918806439.6959.3687690993200892561.stgit@birch.djwong.org> In-Reply-To: <148918798893.6959.7972227235163150709.stgit@birch.djwong.org> References: <148918798893.6959.7972227235163150709.stgit@birch.djwong.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Darrick J. Wong 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/scrub/common.c | 14 + fs/xfs/scrub/common.h | 12 + fs/xfs/scrub/inode.c | 391 +++++++++++++++++++++++++++++++++++++++++ fs/xfs/xfs_bmap_util.c | 4 fs/xfs/xfs_itable.c | 2 fs/xfs/xfs_itable.h | 5 + fs/xfs/xfs_reflink.c | 103 ++++++----- fs/xfs/xfs_reflink.h | 8 + fs/xfs/xfs_trace.h | 3 13 files changed, 495 insertions(+), 56 deletions(-) create mode 100644 fs/xfs/scrub/inode.c diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile index 252d8c6..83fc8d3 100644 --- a/fs/xfs/Makefile +++ b/fs/xfs/Makefile @@ -109,6 +109,7 @@ xfs-$(CONFIG_XFS_DEBUG) += $(addprefix scrub/, \ 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 b33f21a..dafd877 100644 --- a/fs/xfs/libxfs/xfs_fs.h +++ b/fs/xfs/libxfs/xfs_fs.h @@ -503,7 +503,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 0x01 /* i: repair this metadata */ #define XFS_SCRUB_FLAG_CORRUPT 0x02 /* o: needs repair */ diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c index d93f9d9..3752bac 100644 --- a/fs/xfs/libxfs/xfs_inode_buf.c +++ b/fs/xfs/libxfs/xfs_inode_buf.c @@ -381,7 +381,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/scrub/common.c b/fs/xfs/scrub/common.c index 4a6fba7..eeb7364 100644 --- a/fs/xfs/scrub/common.c +++ b/fs/xfs/scrub/common.c @@ -578,6 +578,7 @@ xfs_scrub_dummy( int xfs_scrub_teardown( struct xfs_scrub_context *sc, + struct xfs_inode *ip_in, int error) { xfs_scrub_ag_free(&sc->sa); @@ -586,6 +587,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; } @@ -689,6 +698,7 @@ static const struct xfs_scrub_meta_fns meta_scrub_fns[] = { {xfs_scrub_setup_ag_iallocbt, 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. */ @@ -748,7 +758,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; @@ -759,7 +769,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, error); return error; diff --git a/fs/xfs/scrub/common.h b/fs/xfs/scrub/common.h index 248705b..c2cffc3 100644 --- a/fs/xfs/scrub/common.h +++ b/fs/xfs/scrub/common.h @@ -200,7 +200,8 @@ int xfs_scrub_walk_agfl(struct xfs_scrub_context *sc, /* Setup functions */ -int xfs_scrub_teardown(struct xfs_scrub_context *sc, int error); +int xfs_scrub_teardown(struct xfs_scrub_context *sc, struct xfs_inode *ip_in, + int error); int xfs_scrub_setup(struct xfs_scrub_context *sc, struct xfs_inode *ip, struct xfs_scrub_metadata *sm, bool retry_deadlocked); int xfs_scrub_setup_ag(struct xfs_scrub_context *sc, struct xfs_inode *ip, @@ -213,6 +214,14 @@ int xfs_scrub_setup_ag_iallocbt(struct xfs_scrub_context *sc, struct xfs_inode *ip, struct xfs_scrub_metadata *sm, bool retry_deadlocked); +int xfs_scrub_setup_inode(struct xfs_scrub_context *sc, + struct xfs_inode *ip, + struct xfs_scrub_metadata *sm, + bool retry_deadlocked); +int xfs_scrub_setup_inode_raw(struct xfs_scrub_context *sc, + struct xfs_inode *ip, + struct xfs_scrub_metadata *sm, + bool retry_deadlocked); /* Metadata scrubbers */ @@ -226,5 +235,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/scrub/inode.c b/fs/xfs/scrub/inode.c new file mode 100644 index 0000000..d375d48 --- /dev/null +++ b/fs/xfs/scrub/inode.c @@ -0,0 +1,391 @@ +/* + * Copyright (C) 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 "xfs_log.h" +#include "xfs_trans_priv.h" +#include "xfs_reflink.h" +#include "scrub/common.h" + +/* + * 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, + 0, &ips); + if (error == -ENOENT || error == -EINVAL) { + /* inode doesn't exist... */ + error = -ENOENT; + goto out_err; + } else 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. */ +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); + + 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. */ +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; + + /* Push everything out of the log onto disk prior to check. */ + error = _xfs_log_force(mp, XFS_LOG_SYNC, NULL); + if (error) + return error; + xfs_ail_push_all_sync(mp->m_ail); + + return xfs_scrub_trans_alloc(sm, mp, + &M_RES(mp)->tr_itruncate, 0, 0, 0, &sc->tp); + } + return 0; +} + +/* 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_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; + bool needs; + 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); + if (error == -EINVAL) { + /* + * Inode could have gotten deleted out from under us; + * just forget about it. + */ + error = -ENOENT; + goto out; + } + 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 = -ENOENT; + 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_mode || !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_mode || !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; + + /* + * Does this inode have the reflink flag set but no shared extents? + * Set the preening flag if this is the case. + */ + if (xfs_is_reflink_inode(sc->ip)) { + error = xfs_reflink_needs_inode_flag(sc->tp, sc->ip, &needs); + XFS_SCRUB_INODE_OP_ERROR_GOTO(out); + XFS_SCRUB_INODE_PREEN(needs == true); + } + +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_bmap_util.c b/fs/xfs/xfs_bmap_util.c index 8b75dce..2677aa0 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -456,8 +456,8 @@ xfs_getbmap_adjust_shared( agno = XFS_FSB_TO_AGNO(mp, map->br_startblock); agbno = XFS_FSB_TO_AGBNO(mp, map->br_startblock); - error = xfs_reflink_find_shared(mp, agno, agbno, map->br_blockcount, - &ebno, &elen, true); + error = xfs_reflink_find_shared(mp, NULL, agno, agbno, + map->br_blockcount, &ebno, &elen, true); if (error) return error; 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_reflink.c b/fs/xfs/xfs_reflink.c index da6d08f..b88fa0d 100644 --- a/fs/xfs/xfs_reflink.c +++ b/fs/xfs/xfs_reflink.c @@ -155,6 +155,7 @@ int xfs_reflink_find_shared( struct xfs_mount *mp, + struct xfs_trans *tp, xfs_agnumber_t agno, xfs_agblock_t agbno, xfs_extlen_t aglen, @@ -166,18 +167,18 @@ xfs_reflink_find_shared( struct xfs_btree_cur *cur; int error; - error = xfs_alloc_read_agf(mp, NULL, agno, 0, &agbp); + error = xfs_alloc_read_agf(mp, tp, agno, 0, &agbp); if (error) return error; - cur = xfs_refcountbt_init_cursor(mp, NULL, agbp, agno, NULL); + cur = xfs_refcountbt_init_cursor(mp, tp, agbp, agno, NULL); error = xfs_refcount_find_shared(cur, agbno, aglen, fbno, flen, find_end_of_shared); xfs_btree_del_cursor(cur, error ? XFS_BTREE_ERROR : XFS_BTREE_NOERROR); - xfs_buf_relse(agbp); + xfs_trans_brelse(tp, agbp); return error; } @@ -221,7 +222,7 @@ xfs_reflink_trim_around_shared( agbno = XFS_FSB_TO_AGBNO(ip->i_mount, irec->br_startblock); aglen = irec->br_blockcount; - error = xfs_reflink_find_shared(ip->i_mount, agno, agbno, + error = xfs_reflink_find_shared(ip->i_mount, NULL, agno, agbno, aglen, &fbno, &flen, true); if (error) return error; @@ -1361,8 +1362,8 @@ xfs_reflink_dirty_extents( agbno = XFS_FSB_TO_AGBNO(mp, map[1].br_startblock); aglen = map[1].br_blockcount; - error = xfs_reflink_find_shared(mp, agno, agbno, aglen, - &rbno, &rlen, true); + error = xfs_reflink_find_shared(mp, NULL, agno, agbno, + aglen, &rbno, &rlen, true); if (error) goto out; if (rbno == NULLAGBLOCK) @@ -1393,59 +1394,73 @@ xfs_reflink_dirty_extents( return error; } -/* Clear the inode reflink flag if there are no shared extents. */ +/* Does this inode need the reflink flag? */ int -xfs_reflink_clear_inode_flag( - struct xfs_inode *ip, - struct xfs_trans **tpp) +xfs_reflink_needs_inode_flag( + struct xfs_trans *tp, + struct xfs_inode *ip, + bool *needs_flag) { - struct xfs_mount *mp = ip->i_mount; - xfs_fileoff_t fbno; - xfs_filblks_t end; - xfs_agnumber_t agno; - xfs_agblock_t agbno; - xfs_extlen_t aglen; - xfs_agblock_t rbno; - xfs_extlen_t rlen; - struct xfs_bmbt_irec map; - int nmaps; - int error = 0; - - ASSERT(xfs_is_reflink_inode(ip)); + struct xfs_bmbt_irec got; + struct xfs_mount *mp = ip->i_mount; + struct xfs_ifork *ifp; + xfs_agnumber_t agno; + xfs_agblock_t agbno; + xfs_extlen_t aglen; + xfs_agblock_t rbno; + xfs_extlen_t rlen; + xfs_extnum_t idx; + bool found; + int error; - fbno = 0; - end = XFS_B_TO_FSB(mp, i_size_read(VFS_I(ip))); - while (end - fbno > 0) { - nmaps = 1; - /* - * Look for extents in the file. Skip holes, delalloc, or - * unwritten extents; they can't be reflinked. - */ - error = xfs_bmapi_read(ip, fbno, end - fbno, &map, &nmaps, 0); + ifp = XFS_IFORK_PTR(ip, XFS_DATA_FORK); + if (!(ifp->if_flags & XFS_IFEXTENTS)) { + error = xfs_iread_extents(tp, ip, XFS_DATA_FORK); if (error) return error; - if (nmaps == 0) - break; - if (map.br_startblock == HOLESTARTBLOCK || - map.br_startblock == DELAYSTARTBLOCK || - ISUNWRITTEN(&map)) - goto next; + } - agno = XFS_FSB_TO_AGNO(mp, map.br_startblock); - agbno = XFS_FSB_TO_AGBNO(mp, map.br_startblock); - aglen = map.br_blockcount; + *needs_flag = false; + found = xfs_iext_lookup_extent(ip, ifp, 0, &idx, &got); + while (found) { + if (isnullstartblock(got.br_startblock) || + got.br_state != XFS_EXT_NORM) + goto next; + agno = XFS_FSB_TO_AGNO(mp, got.br_startblock); + agbno = XFS_FSB_TO_AGBNO(mp, got.br_startblock); + aglen = got.br_blockcount; - error = xfs_reflink_find_shared(mp, agno, agbno, aglen, + error = xfs_reflink_find_shared(mp, tp, agno, agbno, aglen, &rbno, &rlen, false); if (error) return error; /* Is there still a shared block here? */ - if (rbno != NULLAGBLOCK) + if (rbno != NULLAGBLOCK) { + *needs_flag = true; return 0; + } next: - fbno = map.br_startoff + map.br_blockcount; + found = xfs_iext_get_extent(ifp, ++idx, &got); } + return 0; +} + +/* Clear the inode reflink flag if there are no shared extents. */ +int +xfs_reflink_clear_inode_flag( + struct xfs_inode *ip, + struct xfs_trans **tpp) +{ + bool needs; + int error = 0; + + ASSERT(xfs_is_reflink_inode(ip)); + + error = xfs_reflink_needs_inode_flag(*tpp, ip, &needs); + if (error || needs) + return error; + /* * We didn't find any shared blocks so turn off the reflink flag. * First, get rid of any leftover CoW mappings. diff --git a/fs/xfs/xfs_reflink.h b/fs/xfs/xfs_reflink.h index 33ac9b8..e33c30f 100644 --- a/fs/xfs/xfs_reflink.h +++ b/fs/xfs/xfs_reflink.h @@ -20,9 +20,9 @@ #ifndef __XFS_REFLINK_H #define __XFS_REFLINK_H 1 -extern int xfs_reflink_find_shared(struct xfs_mount *mp, xfs_agnumber_t agno, - xfs_agblock_t agbno, xfs_extlen_t aglen, xfs_agblock_t *fbno, - xfs_extlen_t *flen, bool find_maximal); +extern int xfs_reflink_find_shared(struct xfs_mount *mp, struct xfs_trans *tp, + xfs_agnumber_t agno, xfs_agblock_t agbno, xfs_extlen_t aglen, + xfs_agblock_t *fbno, xfs_extlen_t *flen, bool find_maximal); extern int xfs_reflink_trim_around_shared(struct xfs_inode *ip, struct xfs_bmbt_irec *irec, bool *shared, bool *trimmed); @@ -47,6 +47,8 @@ extern int xfs_reflink_end_cow(struct xfs_inode *ip, xfs_off_t offset, extern int xfs_reflink_recover_cow(struct xfs_mount *mp); extern int xfs_reflink_remap_range(struct file *file_in, loff_t pos_in, struct file *file_out, loff_t pos_out, u64 len, bool is_dedupe); +extern int xfs_reflink_needs_inode_flag(struct xfs_trans *tp, + struct xfs_inode *ip, bool *needs_flag); extern int xfs_reflink_clear_inode_flag(struct xfs_inode *ip, struct xfs_trans **tpp); extern int xfs_reflink_unshare(struct xfs_inode *ip, xfs_off_t offset, diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h index ac3ab8b..368b2fb 100644 --- a/fs/xfs/xfs_trace.h +++ b/fs/xfs/xfs_trace.h @@ -3364,7 +3364,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, struct xfs_scrub_metadata *sm, int error),