aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_buf.c
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@sandeen.net>2013-11-13 15:53:45 -0500
committerBen Myers <bpm@sgi.com>2013-12-04 14:53:34 -0500
commit3fefdeee92686995ff03e847cbd7bf5ebcd85ff8 (patch)
tree34f7617dfe484ab6b9009160e53b2435698a225a /fs/xfs/xfs_buf.c
parentdc1ccc48159d63eca5089e507c82c7d22ef60839 (diff)
xfs: simplify xfs_setsize_buftarg callchain; remove unused arg
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@redhat.com> Reviewed-by: Brian Foster <bfoster@redhat.com> Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_buf.c')
-rw-r--r--fs/xfs/xfs_buf.c26
1 files changed, 8 insertions, 18 deletions
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index c7f0b77dcb00..ce01c1a17cc1 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -1602,12 +1602,11 @@ xfs_free_buftarg(
1602 kmem_free(btp); 1602 kmem_free(btp);
1603} 1603}
1604 1604
1605STATIC int 1605int
1606xfs_setsize_buftarg_flags( 1606xfs_setsize_buftarg(
1607 xfs_buftarg_t *btp, 1607 xfs_buftarg_t *btp,
1608 unsigned int blocksize, 1608 unsigned int blocksize,
1609 unsigned int sectorsize, 1609 unsigned int sectorsize)
1610 int verbose)
1611{ 1610{
1612 btp->bt_bsize = blocksize; 1611 btp->bt_bsize = blocksize;
1613 btp->bt_sshift = ffs(sectorsize) - 1; 1612 btp->bt_sshift = ffs(sectorsize) - 1;
@@ -1628,26 +1627,17 @@ xfs_setsize_buftarg_flags(
1628} 1627}
1629 1628
1630/* 1629/*
1631 * When allocating the initial buffer target we have not yet 1630 * When allocating the initial buffer target we have not yet
1632 * read in the superblock, so don't know what sized sectors 1631 * read in the superblock, so don't know what sized sectors
1633 * are being used at this early stage. Play safe. 1632 * are being used at this early stage. Play safe.
1634 */ 1633 */
1635STATIC int 1634STATIC int
1636xfs_setsize_buftarg_early( 1635xfs_setsize_buftarg_early(
1637 xfs_buftarg_t *btp, 1636 xfs_buftarg_t *btp,
1638 struct block_device *bdev) 1637 struct block_device *bdev)
1639{ 1638{
1640 return xfs_setsize_buftarg_flags(btp, 1639 return xfs_setsize_buftarg(btp, PAGE_SIZE,
1641 PAGE_SIZE, bdev_logical_block_size(bdev), 0); 1640 bdev_logical_block_size(bdev));
1642}
1643
1644int
1645xfs_setsize_buftarg(
1646 xfs_buftarg_t *btp,
1647 unsigned int blocksize,
1648 unsigned int sectorsize)
1649{
1650 return xfs_setsize_buftarg_flags(btp, blocksize, sectorsize, 1);
1651} 1641}
1652 1642
1653xfs_buftarg_t * 1643xfs_buftarg_t *