Can you splits this up a bit to be more self explanatory, e.g. one patch per warning class or logical change? > if (be32_to_cpu(free->hdr.nvalid) > maxent || > - be32_to_cpu(free->hdr.nvalid) < 0 || > be32_to_cpu(free->hdr.nused) > maxent || > - be32_to_cpu(free->hdr.nused) < 0 || > be32_to_cpu(free->hdr.nused) > > be32_to_cpu(free->hdr.nvalid)) { be32_to_cpu returns uint, so this makese sense. > - (void)getcwd(curdir,MAXPATHLEN); > + if (!getcwd(curdir, MAXPATHLEN)) { > + perror("getcwd"); > + strcpy(curdir, "."); > + } All this chdir magic will need a lot more explanation. To me it seems like most of this is a left over from IRIX days where we could have device names relative to a volume. The proper fix probably is to just remove that whole thing - if we'd ever need to bring it back we should use openat relative to a dirfd instead. > +#define xfs_inode_set_cowblocks_tag(ip) do { } while (0) > +#define xfs_inode_set_eofblocks_tag(ip) do { } while (0) This part looks fine. > #else > #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0) > -#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) > +#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0) > #endif /* DEBUG */ This as well. > diff --git a/repair/phase6.c b/repair/phase6.c > index b051a44..f360aed 100644 > --- a/repair/phase6.c > +++ b/repair/phase6.c > @@ -3092,11 +3092,11 @@ mark_standalone_inodes(xfs_mount_t *mp) > irec = find_inode_rec(mp, XFS_INO_TO_AGNO(mp, mp->m_sb.sb_rsumino), > XFS_INO_TO_AGINO(mp, mp->m_sb.sb_rsumino)); > > + ASSERT(irec != NULL); > + > offset = XFS_INO_TO_AGINO(mp, mp->m_sb.sb_rsumino) - > irec->ino_startnum; > > - ASSERT(irec != NULL); > - What's the point in even having this assert? Either we turn this into something like if (!irec) abort(); or just let the code dereference it. > - imap.br_state = (rm_rec->rm_flags & XFS_RMAP_UNWRITTEN ? > + imap.br_state = ((rm_rec->rm_flags & XFS_RMAP_UNWRITTEN) ? > XFS_EXT_UNWRITTEN : XFS_EXT_NORM); Looks fine. -- 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