On Tue, Aug 08, 2023 at 09:15:51AM -0700, Christoph Hellwig wrote: > There isn't much use for this trivial wrapper, especially as the NULL > check is only needed in a single call site. > > Signed-off-by: Christoph Hellwig <hch@xxxxxx> > --- > fs/xfs/xfs_super.c | 18 +++++------------- > 1 file changed, 5 insertions(+), 13 deletions(-) > > diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c > index d2f3ae6ba8938b..f00d1162815d19 100644 > --- a/fs/xfs/xfs_super.c > +++ b/fs/xfs/xfs_super.c > @@ -395,15 +395,6 @@ xfs_blkdev_get( > return error; > } > > -STATIC void > -xfs_blkdev_put( > - struct xfs_mount *mp, > - struct block_device *bdev) > -{ > - if (bdev) > - blkdev_put(bdev, mp->m_super); > -} > - > STATIC void > xfs_close_devices( > struct xfs_mount *mp) > @@ -412,13 +403,13 @@ xfs_close_devices( > struct block_device *logdev = mp->m_logdev_targp->bt_bdev; > > xfs_free_buftarg(mp->m_logdev_targp); > - xfs_blkdev_put(mp, logdev); > + blkdev_put(logdev, mp->m_super); > } > if (mp->m_rtdev_targp) { > struct block_device *rtdev = mp->m_rtdev_targp->bt_bdev; > > xfs_free_buftarg(mp->m_rtdev_targp); > - xfs_blkdev_put(mp, rtdev); > + blkdev_put(rtdev, mp->m_super); > } > xfs_free_buftarg(mp->m_ddev_targp); > } > @@ -503,10 +494,11 @@ xfs_open_devices( > out_free_ddev_targ: > xfs_free_buftarg(mp->m_ddev_targp); > out_close_rtdev: > - xfs_blkdev_put(mp, rtdev); > + if (rtdev) nit: I think there's a stray space here. Otherwise, Reviewed-by: Christian Brauner <brauner@xxxxxxxxxx>