diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-11-10 10:29:29 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-11-10 10:29:29 +1100 |
| commit | 8f23d318aa746ea0680637a535606637a19073db (patch) | |
| tree | fd90df17569f5b11b4a672fdcb4c57a0d51c655a /fs/xfs/libxfs/xfs_inode_buf.c | |
| parent | b649c42e25b7d1be86d9dade8674dec3d64138fb (diff) | |
| parent | bec9d48d7a303a5bb95c05961ff07ec7eeb59058 (diff) | |
Merge branch 'xfs-4.10-libxfs-cleanups' into for-next
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); |