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

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

xfs: remove unused blocksize arg from xfs_setsize_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 0d7409b1

fs/xfs/xfs_buf.c

+1 −3
Original line number Diff line number Diff line
@@ -1607,7 +1607,6 @@ xfs_free_buftarg( 
int

xfs_setsize_buftarg(

	xfs_buftarg_t		*btp,

	unsigned int		blocksize,

	unsigned int		sectorsize)

{

	/* Set up metadata sector size info */
@@ -1642,8 +1641,7 @@ xfs_setsize_buftarg_early( 
	xfs_buftarg_t		*btp,

	struct block_device	*bdev)

{

	return xfs_setsize_buftarg(btp, PAGE_SIZE,

				   bdev_logical_block_size(bdev));

	return xfs_setsize_buftarg(btp, bdev_logical_block_size(bdev));

}



xfs_buftarg_t *

fs/xfs/xfs_buf.h

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ extern xfs_buftarg_t *xfs_alloc_buftarg(struct xfs_mount *, 
			struct block_device *, int, const char *);

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

extern void xfs_wait_buftarg(xfs_buftarg_t *);

extern int xfs_setsize_buftarg(xfs_buftarg_t *, unsigned int, unsigned int);

extern int xfs_setsize_buftarg(xfs_buftarg_t *, unsigned int);



#define xfs_getsize_buftarg(buftarg)	block_size((buftarg)->bt_bdev)

#define xfs_readonly_buftarg(buftarg)	bdev_read_only((buftarg)->bt_bdev)

fs/xfs/xfs_super.c

+1 −4
Original line number Diff line number Diff line
@@ -811,8 +811,7 @@ xfs_setup_devices( 
{

	int			error;



	error = xfs_setsize_buftarg(mp->m_ddev_targp, mp->m_sb.sb_blocksize,

				    mp->m_sb.sb_sectsize);

	error = xfs_setsize_buftarg(mp->m_ddev_targp, mp->m_sb.sb_sectsize);

	if (error)

		return error;
@@ -822,14 +821,12 @@ xfs_setup_devices( 
		if (xfs_sb_version_hassector(&mp->m_sb))

			log_sector_size = mp->m_sb.sb_logsectsize;

		error = xfs_setsize_buftarg(mp->m_logdev_targp,

					    mp->m_sb.sb_blocksize,

					    log_sector_size);

		if (error)

			return error;

	}

	if (mp->m_rtdev_targp) {

		error = xfs_setsize_buftarg(mp->m_rtdev_targp,

					    mp->m_sb.sb_blocksize,

					    mp->m_sb.sb_sectsize);

		if (error)

			return error;