Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34dcefd7 authored by Eric Sandeen's avatar Eric Sandeen Committed by Dave Chinner
Browse files

xfs: remove unused args from xfs_alloc_buftarg() 



Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent a96c4151

fs/xfs/xfs_buf.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -1647,9 +1647,7 @@ xfs_setsize_buftarg_early( 
xfs_buftarg_t *

xfs_buftarg_t *

xfs_alloc_buftarg(

xfs_alloc_buftarg(

	struct xfs_mount	*mp,

	struct xfs_mount	*mp,

	struct block_device	*bdev,

	struct block_device	*bdev)

	int			external,

	const char		*fsname)

{

{

	xfs_buftarg_t		*btp;

	xfs_buftarg_t		*btp;

fs/xfs/xfs_buf.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -387,7 +387,7 @@ xfs_buf_update_cksum(struct xfs_buf *bp, unsigned long cksum_offset) 
 *	Handling of buftargs.

 *	Handling of buftargs.

 */

 */

extern xfs_buftarg_t *xfs_alloc_buftarg(struct xfs_mount *,

extern xfs_buftarg_t *xfs_alloc_buftarg(struct xfs_mount *,

			struct block_device *, int, const char *);

			struct block_device *);

extern void xfs_free_buftarg(struct xfs_mount *, struct xfs_buftarg *);

extern void xfs_free_buftarg(struct xfs_mount *, struct xfs_buftarg *);

extern void xfs_wait_buftarg(xfs_buftarg_t *);

extern void xfs_wait_buftarg(xfs_buftarg_t *);

extern int xfs_setsize_buftarg(xfs_buftarg_t *, unsigned int);

extern int xfs_setsize_buftarg(xfs_buftarg_t *, unsigned int);

fs/xfs/xfs_super.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -765,20 +765,18 @@ xfs_open_devices( 
	 * Setup xfs_mount buffer target pointers

	 * Setup xfs_mount buffer target pointers

	 */

	 */

	error = ENOMEM;

	error = ENOMEM;

	mp->m_ddev_targp = xfs_alloc_buftarg(mp, ddev, 0, mp->m_fsname);

	mp->m_ddev_targp = xfs_alloc_buftarg(mp, ddev);

	if (!mp->m_ddev_targp)

	if (!mp->m_ddev_targp)

		goto out_close_rtdev;

		goto out_close_rtdev;





	if (rtdev) {

	if (rtdev) {

		mp->m_rtdev_targp = xfs_alloc_buftarg(mp, rtdev, 1,

		mp->m_rtdev_targp = xfs_alloc_buftarg(mp, rtdev);

							mp->m_fsname);

		if (!mp->m_rtdev_targp)

		if (!mp->m_rtdev_targp)

			goto out_free_ddev_targ;

			goto out_free_ddev_targ;

	}

	}





	if (logdev && logdev != ddev) {

	if (logdev && logdev != ddev) {

		mp->m_logdev_targp = xfs_alloc_buftarg(mp, logdev, 1,

		mp->m_logdev_targp = xfs_alloc_buftarg(mp, logdev);

							mp->m_fsname);

		if (!mp->m_logdev_targp)

		if (!mp->m_logdev_targp)

			goto out_free_rtdev_targ;

			goto out_free_rtdev_targ;

	} else {

	} else {