On 11/4/16 1:31 PM, Darrick J. Wong wrote:
> The userspace version of _dinode_verify takes a raw inode number
> instead of an inode itself. Since neither version actually needs
> the inode, port the changes to the kernel. This will also reduce
> the libxfs diff noise.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> ---
> fs/xfs/libxfs/xfs_inode_buf.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
> index 134424f..3a6694b 100644
> --- a/fs/xfs/libxfs/xfs_inode_buf.c
> +++ b/fs/xfs/libxfs/xfs_inode_buf.c
> @@ -380,10 +380,10 @@ xfs_log_dinode_to_disk(
> }
> }
>
> -static bool
> +bool
> xfs_dinode_verify(
I believe this can/should be static in both userspace & kernelspace.
Otherwise looks fine to me; not sure why the ip-vs-ino difference
exists, but it's 6 one way half a dozen the other I guess.
-Eric
> struct xfs_mount *mp,
> - struct xfs_inode *ip,
> + xfs_ino_t ino,
> struct xfs_dinode *dip)
> {
> uint16_t flags;
> @@ -401,7 +401,7 @@ xfs_dinode_verify(
> if (!xfs_verify_cksum((char *)dip, mp->m_sb.sb_inodesize,
> XFS_DINODE_CRC_OFF))
> return false;
> - if (be64_to_cpu(dip->di_ino) != ip->i_ino)
> + if (be64_to_cpu(dip->di_ino) != ino)
> return false;
> if (!uuid_equal(&dip->di_uuid, &mp->m_sb.sb_meta_uuid))
> return false;
> @@ -493,7 +493,7 @@ xfs_iread(
> return error;
>
> /* even unallocated inodes are verified */
> - if (!xfs_dinode_verify(mp, ip, dip)) {
> + if (!xfs_dinode_verify(mp, ip->i_ino, dip)) {
> xfs_alert(mp, "%s: validation failed for inode %lld failed",
> __func__, ip->i_ino);
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
