On 11/13/2013 03:53 PM, Eric Sandeen wrote:
> The "verbose" argument to xfs_setsize_buftarg_flags() has been
> unused since:
>
> ffe37436 xfs: stop using the page cache to back the buffer cache
>
> Remove it, and fold the function into xfs_setsize_buftarg()
> now that there's no need for different types of callers.
>
> Fix inconsistent comment spacing while we're at it.
>
> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
> ---
Looks good to me.
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
>
> V2: Fold old helper function into xfs_setsize_buftarg,
> per Brian's suggestion.
>
> xfs_buf.c | 26 ++++++++------------------
> 1 file changed, 8 insertions(+), 18 deletions(-)
>
> diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
> index 2634700..0ce3b7b 100644
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
> @@ -1601,12 +1601,11 @@ xfs_free_buftarg(
> kmem_free(btp);
> }
>
> -STATIC int
> -xfs_setsize_buftarg_flags(
> +int
> +xfs_setsize_buftarg(
> xfs_buftarg_t *btp,
> unsigned int blocksize,
> - unsigned int sectorsize,
> - int verbose)
> + unsigned int sectorsize)
> {
> btp->bt_bsize = blocksize;
> btp->bt_sshift = ffs(sectorsize) - 1;
> @@ -1627,26 +1626,17 @@ xfs_setsize_buftarg_flags(
> }
>
> /*
> - * When allocating the initial buffer target we have not yet
> - * read in the superblock, so don't know what sized sectors
> - * are being used at this early stage. Play safe.
> + * When allocating the initial buffer target we have not yet
> + * read in the superblock, so don't know what sized sectors
> + * are being used at this early stage. Play safe.
> */
> STATIC int
> xfs_setsize_buftarg_early(
> xfs_buftarg_t *btp,
> struct block_device *bdev)
> {
> - return xfs_setsize_buftarg_flags(btp,
> - PAGE_SIZE, bdev_logical_block_size(bdev), 0);
> -}
> -
> -int
> -xfs_setsize_buftarg(
> - xfs_buftarg_t *btp,
> - unsigned int blocksize,
> - unsigned int sectorsize)
> -{
> - return xfs_setsize_buftarg_flags(btp, blocksize, sectorsize, 1);
> + return xfs_setsize_buftarg(btp, PAGE_SIZE,
> + bdev_logical_block_size(bdev));
> }
>
> xfs_buftarg_t *
>
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs
>
|