> for (agno = 0; agno < sc->mp->m_sb.sb_agcount; agno++) { > @@ -651,8 +647,9 @@ xchk_bmap( > } > break; > case XFS_ATTR_FORK: > + /* No fork means no attr data at all. */ > if (!ifp) > - goto out_check_rmap; > + goto out; Maybe lift the !ifp to before the switch statement, or even to just after assigning the value to ifp? For the data fork it obviously won't be true, but it still looks simple than duplicating it for the attr and cow fork. Otherwise looks fine: Reviewed-by: Christoph Hellwig <hch@xxxxxx>