On Mon, Mar 27, 2017 at 10:08:28AM -0700, Darrick J. Wong wrote:
> The inline directory verifiers should be called on the inode fork data,
> which means after iformat_local on the read side, and prior to
> ifork_flush on the write side. This makes the fork verifier more
> consistent with the way buffer verifiers work -- i.e. they will operate
> on the memory buffer that the code will be reading and writing directly.
>
> Also revise the verifier function to return -EFSCORRUPTED so that we
> don't flood the logs with corruption messages and assert notices.
>
> I've been testing xfs/348 in a loop for 4 days now and it seems to fix
> all of the crashes and weird behavior introduced by the original patch.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
....
> --- a/fs/xfs/libxfs/xfs_dir2_sf.c
> +++ b/fs/xfs/libxfs/xfs_dir2_sf.c
> @@ -632,36 +632,45 @@ xfs_dir2_sf_check(
> /* Verify the consistency of an inline directory. */
> int
> xfs_dir2_sf_verify(
> - struct xfs_mount *mp,
> - struct xfs_dir2_sf_hdr *sfp,
> - int size)
> + struct xfs_inode *ip)
> {
> + struct xfs_mount *mp = ip->i_mount;
> + struct xfs_dir2_sf_hdr *sfp;
> struct xfs_dir2_sf_entry *sfep;
> struct xfs_dir2_sf_entry *next_sfep;
> char *endp;
> const struct xfs_dir_ops *dops;
> + struct xfs_ifork *ifp;
> xfs_ino_t ino;
> int i;
> int i8count;
> int offset;
> + int size;
> + int error;
> __uint8_t filetype;
>
> - dops = xfs_dir_get_ops(mp, NULL);
> + ASSERT(ip->i_d.di_format == XFS_DINODE_FMT_LOCAL);
> + dops = mp->m_dir_inode_ops;
Please use xfs_dir_get_ops() for consistency - that way we don't
have to care what context this function gets called from in future
(especially in userspace!).
Cheers,
Dave.
--
Dave Chinner
david@xxxxxxxxxxxxx
--
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
