On Fri, May 01, 2020 at 10:14:15AM +0200, Christoph Hellwig wrote:
> xfs_iformat_fork is a weird catchall. Split it into one helper for
> the data fork and one for the attr fork, and then call both helper
> as well as the COW fork initialization from xfs_inode_from_disk. Order
> the COW fork initialization after the attr fork initialization given
> that it can't fail to simplify the error handling.
>
> Note that the newly split helpers are moved down the file in
> xfs_inode_fork.c to avoid the need for forward declarations.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
> fs/xfs/libxfs/xfs_inode_buf.c | 20 +++-
> fs/xfs/libxfs/xfs_inode_fork.c | 186 +++++++++++++++------------------
> fs/xfs/libxfs/xfs_inode_fork.h | 3 +-
> 3 files changed, 103 insertions(+), 106 deletions(-)
>
...
> diff --git a/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c
> index 518c6f0ec3a61..f30d43364aa92 100644
> --- a/fs/xfs/libxfs/xfs_inode_fork.c
> +++ b/fs/xfs/libxfs/xfs_inode_fork.c
...
> @@ -325,6 +221,88 @@ xfs_iformat_btree(
> return 0;
> }
>
> +int
> +xfs_iformat_data_fork(
> + struct xfs_inode *ip,
> + struct xfs_dinode *dip)
> +{
> + struct inode *inode = VFS_I(ip);
> +
> + switch (inode->i_mode & S_IFMT) {
> + case S_IFIFO:
> + case S_IFCHR:
> + case S_IFBLK:
> + case S_IFSOCK:
> + ip->i_d.di_size = 0;
> + inode->i_rdev = xfs_to_linux_dev_t(xfs_dinode_get_rdev(dip));
> + return 0;
> + case S_IFREG:
> + case S_IFLNK:
> + case S_IFDIR:
> + switch (dip->di_format) {
> + case XFS_DINODE_FMT_LOCAL:
> + return xfs_iformat_local(ip, dip, XFS_DATA_FORK,
> + be64_to_cpu(dip->di_size));
> + case XFS_DINODE_FMT_EXTENTS:
> + return xfs_iformat_extents(ip, dip, XFS_DATA_FORK);
> + case XFS_DINODE_FMT_BTREE:
> + return xfs_iformat_btree(ip, dip, XFS_DATA_FORK);
> + default:
> + xfs_inode_verifier_error(ip, -EFSCORRUPTED, __func__,
> + dip, sizeof(*dip), __this_address);
> + return -EFSCORRUPTED;
> + }
> + break;
> + default:
> + xfs_inode_verifier_error(ip, -EFSCORRUPTED, __func__, dip,
> + sizeof(*dip), __this_address);
> + return -EFSCORRUPTED;
> + }
Can we fix this function up to use an error variable and return error at
the end like xfs_iformat_attr_work() does? Otherwise nice cleanup..
Brian
> +}
> +
> +static uint16_t
> +xfs_dfork_attr_shortform_size(
> + struct xfs_dinode *dip)
> +{
> + struct xfs_attr_shortform *atp =
> + (struct xfs_attr_shortform *)XFS_DFORK_APTR(dip);
> +
> + return be16_to_cpu(atp->hdr.totsize);
> +}
> +
> +int
> +xfs_iformat_attr_fork(
> + struct xfs_inode *ip,
> + struct xfs_dinode *dip)
> +{
> + int error = 0;
> +
> + ip->i_afp = kmem_zone_zalloc(xfs_ifork_zone, KM_NOFS);
> + switch (dip->di_aformat) {
> + case XFS_DINODE_FMT_LOCAL:
> + error = xfs_iformat_local(ip, dip, XFS_ATTR_FORK,
> + xfs_dfork_attr_shortform_size(dip));
> + break;
> + case XFS_DINODE_FMT_EXTENTS:
> + error = xfs_iformat_extents(ip, dip, XFS_ATTR_FORK);
> + break;
> + case XFS_DINODE_FMT_BTREE:
> + error = xfs_iformat_btree(ip, dip, XFS_ATTR_FORK);
> + break;
> + default:
> + xfs_inode_verifier_error(ip, error, __func__, dip,
> + sizeof(*dip), __this_address);
> + error = -EFSCORRUPTED;
> + break;
> + }
> +
> + if (error) {
> + kmem_cache_free(xfs_ifork_zone, ip->i_afp);
> + ip->i_afp = NULL;
> + }
> + return error;
> +}
> +
> /*
> * Reallocate the space for if_broot based on the number of records
> * being added or deleted as indicated in rec_diff. Move the records
> diff --git a/fs/xfs/libxfs/xfs_inode_fork.h b/fs/xfs/libxfs/xfs_inode_fork.h
> index 668ee942be224..8487b0c88a75e 100644
> --- a/fs/xfs/libxfs/xfs_inode_fork.h
> +++ b/fs/xfs/libxfs/xfs_inode_fork.h
> @@ -88,7 +88,8 @@ struct xfs_ifork {
>
> struct xfs_ifork *xfs_iext_state_to_fork(struct xfs_inode *ip, int state);
>
> -int xfs_iformat_fork(struct xfs_inode *, struct xfs_dinode *);
> +int xfs_iformat_data_fork(struct xfs_inode *, struct xfs_dinode *);
> +int xfs_iformat_attr_fork(struct xfs_inode *, struct xfs_dinode *);
> void xfs_iflush_fork(struct xfs_inode *, struct xfs_dinode *,
> struct xfs_inode_log_item *, int);
> void xfs_idestroy_fork(struct xfs_inode *, int);
> --
> 2.26.2
>
