diff options
| author | Darrick J. Wong <darrick.wong@oracle.com> | 2016-11-08 11:56:06 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-11-08 11:56:06 +1100 |
| commit | 420fbeb4bff483d89dd8de9242b8fd83e2eb3527 (patch) | |
| tree | abf49a0c4638383e0a3742d5abb7bbdc692f5dd5 /fs/xfs/libxfs/xfs_inode_buf.c | |
| parent | 755c7bf5ddcaf88d7f39bbd702c6c082cef5b8a2 (diff) | |
| download | linux-420fbeb4bff483d89dd8de9242b8fd83e2eb3527.tar.gz linux-420fbeb4bff483d89dd8de9242b8fd83e2eb3527.tar.bz2 linux-420fbeb4bff483d89dd8de9242b8fd83e2eb3527.zip | |
libxfs: synchronize dinode_verify with userspace
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@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/libxfs/xfs_inode_buf.c')
| -rw-r--r-- | fs/xfs/libxfs/xfs_inode_buf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c index 134424fac434..54817f82212c 100644 --- a/fs/xfs/libxfs/xfs_inode_buf.c +++ b/fs/xfs/libxfs/xfs_inode_buf.c @@ -383,7 +383,7 @@ xfs_log_dinode_to_disk( static bool xfs_dinode_verify( 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); |