niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

xfs: improve local fork verification

Browse source 
Call the data/attr local fork verifiers as soon as we are ready for them.
This keeps them close to the code setting up the forks, and avoids a
few branches later on.  Also open code xfs_inode_verify_forks in the
only remaining caller.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Christoph Hellwig 2020-05-14 14:01:31 -07:00 • committed by Darrick J. Wong
parent 7c7ba21863
commit 0f45a1b20c
5 changed files with 16 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/xfs/libxfs/xfs_inode_fork.c
View file

@ -227,6 +227,7 @@ xfs_iformat_data_fork(
struct xfs_dinode *dip) struct xfs_dinode *dip)
{ {
struct inode *inode = VFS_I(ip); struct inode *inode = VFS_I(ip);
int error;
switch (inode->i_mode & S_IFMT) { switch (inode->i_mode & S_IFMT) {
case S_IFIFO: case S_IFIFO:
@ -241,8 +242,11 @@ xfs_iformat_data_fork(
case S_IFDIR: case S_IFDIR:
switch (dip->di_format) { switch (dip->di_format) {
case XFS_DINODE_FMT_LOCAL: case XFS_DINODE_FMT_LOCAL:
return xfs_iformat_local(ip, dip, XFS_DATA_FORK, error = xfs_iformat_local(ip, dip, XFS_DATA_FORK,
be64_to_cpu(dip->di_size)); be64_to_cpu(dip->di_size));
if (!error)
error = xfs_ifork_verify_local_data(ip);
return error;
case XFS_DINODE_FMT_EXTENTS: case XFS_DINODE_FMT_EXTENTS:
return xfs_iformat_extents(ip, dip, XFS_DATA_FORK); return xfs_iformat_extents(ip, dip, XFS_DATA_FORK);
case XFS_DINODE_FMT_BTREE: case XFS_DINODE_FMT_BTREE:
@ -282,6 +286,8 @@ xfs_iformat_attr_fork(
case XFS_DINODE_FMT_LOCAL: case XFS_DINODE_FMT_LOCAL:
error = xfs_iformat_local(ip, dip, XFS_ATTR_FORK, error = xfs_iformat_local(ip, dip, XFS_ATTR_FORK,
xfs_dfork_attr_shortform_size(dip)); xfs_dfork_attr_shortform_size(dip));
if (!error)
error = xfs_ifork_verify_local_attr(ip);
break; break;
case XFS_DINODE_FMT_EXTENTS: case XFS_DINODE_FMT_EXTENTS:
error = xfs_iformat_extents(ip, dip, XFS_ATTR_FORK); error = xfs_iformat_extents(ip, dip, XFS_ATTR_FORK);

6
fs/xfs/xfs_icache.c
View file

@ -543,14 +543,8 @@ xfs_iget_cache_miss(
goto out_destroy; goto out_destroy;
} }
if (!xfs_inode_verify_forks(ip)) {
error = -EFSCORRUPTED;
goto out_destroy;
}
trace_xfs_iget_miss(ip); trace_xfs_iget_miss(ip);
/* /*
* Check the inode free state is valid. This also detects lookup * Check the inode free state is valid. This also detects lookup
* racing with unlinks. * racing with unlinks.

28
fs/xfs/xfs_inode.c
View file

@ -3707,23 +3707,6 @@ shutdown:
return error; return error;
} }
/*
* If there are inline format data / attr forks attached to this inode,
* make sure they're not corrupt.
*/
bool
xfs_inode_verify_forks(
struct xfs_inode *ip)
{
if (ip->i_d.di_format == XFS_DINODE_FMT_LOCAL &&
xfs_ifork_verify_local_data(ip))
return false;
if (ip->i_d.di_aformat == XFS_DINODE_FMT_LOCAL &&
xfs_ifork_verify_local_attr(ip))
return false;
return true;
}
STATIC int STATIC int
xfs_iflush_int( xfs_iflush_int(
struct xfs_inode *ip, struct xfs_inode *ip,
@ -3808,8 +3791,15 @@ xfs_iflush_int(
if (!xfs_sb_version_has_v3inode(&mp->m_sb)) if (!xfs_sb_version_has_v3inode(&mp->m_sb))
ip->i_d.di_flushiter++; ip->i_d.di_flushiter++;
/* Check the inline fork data before we write out. */ /*
if (!xfs_inode_verify_forks(ip)) * If there are inline format data / attr forks attached to this inode,
* make sure they are not corrupt.
*/
if (ip->i_d.di_format == XFS_DINODE_FMT_LOCAL &&
xfs_ifork_verify_local_data(ip))
goto flush_out;
if (ip->i_d.di_aformat == XFS_DINODE_FMT_LOCAL &&
xfs_ifork_verify_local_attr(ip))
goto flush_out; goto flush_out;
/* /*

2
fs/xfs/xfs_inode.h
View file

@ -498,8 +498,6 @@ extern struct kmem_zone *xfs_inode_zone;
/* The default CoW extent size hint. */ /* The default CoW extent size hint. */
#define XFS_DEFAULT_COWEXTSZ_HINT 32 #define XFS_DEFAULT_COWEXTSZ_HINT 32
bool xfs_inode_verify_forks(struct xfs_inode *ip);
int xfs_iunlink_init(struct xfs_perag *pag); int xfs_iunlink_init(struct xfs_perag *pag);
void xfs_iunlink_destroy(struct xfs_perag *pag); void xfs_iunlink_destroy(struct xfs_perag *pag);

5
fs/xfs/xfs_inode_item_recover.c
View file

@ -94,11 +94,6 @@ xfs_recover_inode_owner_change(
if (error) if (error)
goto out_free_ip; goto out_free_ip;
if (!xfs_inode_verify_forks(ip)) {
error = -EFSCORRUPTED;
goto out_free_ip;
}
if (in_f->ilf_fields & XFS_ILOG_DOWNER) { if (in_f->ilf_fields & XFS_ILOG_DOWNER) {
ASSERT(in_f->ilf_fields & XFS_ILOG_DBROOT); ASSERT(in_f->ilf_fields & XFS_ILOG_DBROOT);
error = xfs_bmbt_change_owner(NULL, ip, XFS_DATA_FORK, error = xfs_bmbt_change_owner(NULL, ip, XFS_DATA_FORK,