Skip to content

Commit

Permalink
xfs: refactor xfs_inode_item_format
Browse files Browse the repository at this point in the history 
Split out a function to handle the data and attr fork, as well as a
helper for the really old v1 inodes.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
  • Loading branch information
Christoph Hellwig authored and Dave Chinner committed Dec 13, 2013
1 parent ce9641d commit 3de559f
Showing 1 changed file with 89 additions and 76 deletions.
165 changes: 89 additions & 76 deletions fs/xfs/xfs_inode_item.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,63 +180,41 @@ xfs_inode_item_format_extents(
}

/*
* This is called to fill in the vector of log iovecs for the
* given inode log item. It fills the first item with an inode
* log format structure, the second with the on-disk inode structure,
* and a possible third and/or fourth with the inode data/extents/b-tree
* root and inode attributes data/extents/b-tree root.
* If this is a v1 format inode, then we need to log it as such. This means
* that we have to copy the link count from the new field to the old. We
* don't have to worry about the new fields, because nothing trusts them as
* long as the old inode version number is there.
*/
STATIC void
xfs_inode_item_format(
struct xfs_log_item *lip,
struct xfs_log_iovec *vecp)
xfs_inode_item_format_v1_inode(
struct xfs_inode *ip)
{
if (!xfs_sb_version_hasnlink(&ip->i_mount->m_sb)) {
/*
* Convert it back.
*/
ASSERT(ip->i_d.di_nlink <= XFS_MAXLINK_1);
ip->i_d.di_onlink = ip->i_d.di_nlink;
} else {
/*
* The superblock version has already been bumped,
* so just make the conversion to the new inode
* format permanent.
*/
ip->i_d.di_version = 2;
ip->i_d.di_onlink = 0;
memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
}
}

STATIC struct xfs_log_iovec *
xfs_inode_item_format_data_fork(
struct xfs_inode_log_item *iip,
struct xfs_log_iovec *vecp,
int *nvecs)
{
struct xfs_inode_log_item *iip = INODE_ITEM(lip);
struct xfs_inode *ip = iip->ili_inode;
uint nvecs;
size_t data_bytes;
xfs_mount_t *mp;

vecp->i_addr = &iip->ili_format;
vecp->i_len = sizeof(xfs_inode_log_format_t);
vecp->i_type = XLOG_REG_TYPE_IFORMAT;
vecp++;
nvecs = 1;

vecp->i_addr = &ip->i_d;
vecp->i_len = xfs_icdinode_size(ip->i_d.di_version);
vecp->i_type = XLOG_REG_TYPE_ICORE;
vecp++;
nvecs++;

/*
* If this is really an old format inode, then we need to
* log it as such. This means that we have to copy the link
* count from the new field to the old. We don't have to worry
* about the new fields, because nothing trusts them as long as
* the old inode version number is there. If the superblock already
* has a new version number, then we don't bother converting back.
*/
mp = ip->i_mount;
ASSERT(ip->i_d.di_version == 1 || xfs_sb_version_hasnlink(&mp->m_sb));
if (ip->i_d.di_version == 1) {
if (!xfs_sb_version_hasnlink(&mp->m_sb)) {
/*
* Convert it back.
*/
ASSERT(ip->i_d.di_nlink <= XFS_MAXLINK_1);
ip->i_d.di_onlink = ip->i_d.di_nlink;
} else {
/*
* The superblock version has already been bumped,
* so just make the conversion to the new inode
* format permanent.
*/
ip->i_d.di_version = 2;
ip->i_d.di_onlink = 0;
memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
}
}

switch (ip->i_d.di_format) {
case XFS_DINODE_FMT_EXTENTS:
Expand Down Expand Up @@ -271,12 +249,11 @@ xfs_inode_item_format(
ASSERT(vecp->i_len <= ip->i_df.if_bytes);
iip->ili_format.ilf_dsize = vecp->i_len;
vecp++;
nvecs++;
(*nvecs)++;
} else {
iip->ili_fields &= ~XFS_ILOG_DEXT;
}
break;

case XFS_DINODE_FMT_BTREE:
iip->ili_fields &=
~(XFS_ILOG_DDATA | XFS_ILOG_DEXT |
Expand All @@ -289,15 +266,14 @@ xfs_inode_item_format(
vecp->i_len = ip->i_df.if_broot_bytes;
vecp->i_type = XLOG_REG_TYPE_IBROOT;
vecp++;
nvecs++;
(*nvecs)++;
iip->ili_format.ilf_dsize = ip->i_df.if_broot_bytes;
} else {
ASSERT(!(iip->ili_fields &
XFS_ILOG_DBROOT));
iip->ili_fields &= ~XFS_ILOG_DBROOT;
}
break;

case XFS_DINODE_FMT_LOCAL:
iip->ili_fields &=
~(XFS_ILOG_DEXT | XFS_ILOG_DBROOT |
Expand All @@ -319,13 +295,12 @@ xfs_inode_item_format(
vecp->i_len = (int)data_bytes;
vecp->i_type = XLOG_REG_TYPE_ILOCAL;
vecp++;
nvecs++;
(*nvecs)++;
iip->ili_format.ilf_dsize = (unsigned)data_bytes;
} else {
iip->ili_fields &= ~XFS_ILOG_DDATA;
}
break;

case XFS_DINODE_FMT_DEV:
iip->ili_fields &=
~(XFS_ILOG_DDATA | XFS_ILOG_DBROOT |
Expand All @@ -335,7 +310,6 @@ xfs_inode_item_format(
ip->i_df.if_u2.if_rdev;
}
break;

case XFS_DINODE_FMT_UUID:
iip->ili_fields &=
~(XFS_ILOG_DDATA | XFS_ILOG_DBROOT |
Expand All @@ -345,20 +319,22 @@ xfs_inode_item_format(
ip->i_df.if_u2.if_uuid;
}
break;

default:
ASSERT(0);
break;
}

/*
* If there are no attributes associated with the file, then we're done.
*/
if (!XFS_IFORK_Q(ip)) {
iip->ili_fields &=
~(XFS_ILOG_ADATA | XFS_ILOG_ABROOT | XFS_ILOG_AEXT);
goto out;
}
return vecp;
}

STATIC struct xfs_log_iovec *
xfs_inode_item_format_attr_fork(
struct xfs_inode_log_item *iip,
struct xfs_log_iovec *vecp,
int *nvecs)
{
struct xfs_inode *ip = iip->ili_inode;
size_t data_bytes;

switch (ip->i_d.di_aformat) {
case XFS_DINODE_FMT_EXTENTS:
Expand Down Expand Up @@ -386,12 +362,11 @@ xfs_inode_item_format(
#endif
iip->ili_format.ilf_asize = vecp->i_len;
vecp++;
nvecs++;
(*nvecs)++;
} else {
iip->ili_fields &= ~XFS_ILOG_AEXT;
}
break;

case XFS_DINODE_FMT_BTREE:
iip->ili_fields &=
~(XFS_ILOG_ADATA | XFS_ILOG_AEXT);
Expand All @@ -404,13 +379,12 @@ xfs_inode_item_format(
vecp->i_len = ip->i_afp->if_broot_bytes;
vecp->i_type = XLOG_REG_TYPE_IATTR_BROOT;
vecp++;
nvecs++;
(*nvecs)++;
iip->ili_format.ilf_asize = ip->i_afp->if_broot_bytes;
} else {
iip->ili_fields &= ~XFS_ILOG_ABROOT;
}
break;

case XFS_DINODE_FMT_LOCAL:
iip->ili_fields &=
~(XFS_ILOG_AEXT | XFS_ILOG_ABROOT);
Expand All @@ -431,19 +405,59 @@ xfs_inode_item_format(
vecp->i_len = (int)data_bytes;
vecp->i_type = XLOG_REG_TYPE_IATTR_LOCAL;
vecp++;
nvecs++;
(*nvecs)++;
iip->ili_format.ilf_asize = (unsigned)data_bytes;
} else {
iip->ili_fields &= ~XFS_ILOG_ADATA;
}
break;

default:
ASSERT(0);
break;
}

out:
return vecp;
}

/*
* This is called to fill in the vector of log iovecs for the given inode
* log item. It fills the first item with an inode log format structure,
* the second with the on-disk inode structure, and a possible third and/or
* fourth with the inode data/extents/b-tree root and inode attributes
* data/extents/b-tree root.
*/
STATIC void
xfs_inode_item_format(
struct xfs_log_item *lip,
struct xfs_log_iovec *vecp)
{
struct xfs_inode_log_item *iip = INODE_ITEM(lip);
struct xfs_inode *ip = iip->ili_inode;
uint nvecs;

vecp->i_addr = &iip->ili_format;
vecp->i_len = sizeof(xfs_inode_log_format_t);
vecp->i_type = XLOG_REG_TYPE_IFORMAT;
vecp++;
nvecs = 1;

vecp->i_addr = &ip->i_d;
vecp->i_len = xfs_icdinode_size(ip->i_d.di_version);
vecp->i_type = XLOG_REG_TYPE_ICORE;
vecp++;
nvecs++;

if (ip->i_d.di_version == 1)
xfs_inode_item_format_v1_inode(ip);

vecp = xfs_inode_item_format_data_fork(iip, vecp, &nvecs);
if (XFS_IFORK_Q(ip)) {
vecp = xfs_inode_item_format_attr_fork(iip, vecp, &nvecs);
} else {
iip->ili_fields &=
~(XFS_ILOG_ADATA | XFS_ILOG_ABROOT | XFS_ILOG_AEXT);
}

/*
* Now update the log format that goes out to disk from the in-core
* values. We always write the inode core to make the arithmetic
Expand All @@ -455,7 +469,6 @@ xfs_inode_item_format(
iip->ili_format.ilf_size = nvecs;
}


/*
* This is called to pin the inode associated with the inode log
* item in memory so it cannot be written out.
Expand Down

0 comments on commit 3de559f

Please sign in to comment.