On Thu, Jan 16, 2020 at 08:33:55AM -0800, Christoph Hellwig wrote: > > ASSERT(fsbno != NULLFSBLOCK); > > d = XFS_FSB_TO_DADDR(mp, fsbno); > > - error = xfs_trans_get_buf(tp, mp->m_ddev_targp, d, mp->m_bsize, 0, &bp); > > - if (error) > > - return NULL; > > - return bp; > > + return xfs_trans_get_buf(tp, mp->m_ddev_targp, d, mp->m_bsize, 0, bpp); > > Maybe kill the local variable while you're at it? Or maybe just kill xfs_btree_get_bufl and xfs_btree_get_bufs? They are completely trivial now, and each one just has two callers.