diff options
-rw-r--r-- | fs/xfs/xfs_buf.c | 4 | ||||
-rw-r--r-- | fs/xfs/xfs_buf.h | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_super.c | 8 |
3 files changed, 5 insertions, 9 deletions
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index 6638bf1f3838..9ea2c88e2288 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c | |||
@@ -1647,9 +1647,7 @@ xfs_setsize_buftarg_early( | |||
1647 | xfs_buftarg_t * | 1647 | xfs_buftarg_t * |
1648 | xfs_alloc_buftarg( | 1648 | xfs_alloc_buftarg( |
1649 | struct xfs_mount *mp, | 1649 | struct xfs_mount *mp, |
1650 | struct block_device *bdev, | 1650 | struct block_device *bdev) |
1651 | int external, | ||
1652 | const char *fsname) | ||
1653 | { | 1651 | { |
1654 | xfs_buftarg_t *btp; | 1652 | xfs_buftarg_t *btp; |
1655 | 1653 | ||
diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h index 37311e35c905..0e47fd1fedba 100644 --- a/fs/xfs/xfs_buf.h +++ b/fs/xfs/xfs_buf.h | |||
@@ -387,7 +387,7 @@ xfs_buf_update_cksum(struct xfs_buf *bp, unsigned long cksum_offset) | |||
387 | * Handling of buftargs. | 387 | * Handling of buftargs. |
388 | */ | 388 | */ |
389 | extern xfs_buftarg_t *xfs_alloc_buftarg(struct xfs_mount *, | 389 | extern xfs_buftarg_t *xfs_alloc_buftarg(struct xfs_mount *, |
390 | struct block_device *, int, const char *); | 390 | struct block_device *); |
391 | extern void xfs_free_buftarg(struct xfs_mount *, struct xfs_buftarg *); | 391 | extern void xfs_free_buftarg(struct xfs_mount *, struct xfs_buftarg *); |
392 | extern void xfs_wait_buftarg(xfs_buftarg_t *); | 392 | extern void xfs_wait_buftarg(xfs_buftarg_t *); |
393 | extern int xfs_setsize_buftarg(xfs_buftarg_t *, unsigned int); | 393 | extern int xfs_setsize_buftarg(xfs_buftarg_t *, unsigned int); |
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 6ef8aa46679d..118aa74486b2 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c | |||
@@ -765,20 +765,18 @@ xfs_open_devices( | |||
765 | * Setup xfs_mount buffer target pointers | 765 | * Setup xfs_mount buffer target pointers |
766 | */ | 766 | */ |
767 | error = ENOMEM; | 767 | error = ENOMEM; |
768 | mp->m_ddev_targp = xfs_alloc_buftarg(mp, ddev, 0, mp->m_fsname); | 768 | mp->m_ddev_targp = xfs_alloc_buftarg(mp, ddev); |
769 | if (!mp->m_ddev_targp) | 769 | if (!mp->m_ddev_targp) |
770 | goto out_close_rtdev; | 770 | goto out_close_rtdev; |
771 | 771 | ||
772 | if (rtdev) { | 772 | if (rtdev) { |
773 | mp->m_rtdev_targp = xfs_alloc_buftarg(mp, rtdev, 1, | 773 | mp->m_rtdev_targp = xfs_alloc_buftarg(mp, rtdev); |
774 | mp->m_fsname); | ||
775 | if (!mp->m_rtdev_targp) | 774 | if (!mp->m_rtdev_targp) |
776 | goto out_free_ddev_targ; | 775 | goto out_free_ddev_targ; |
777 | } | 776 | } |
778 | 777 | ||
779 | if (logdev && logdev != ddev) { | 778 | if (logdev && logdev != ddev) { |
780 | mp->m_logdev_targp = xfs_alloc_buftarg(mp, logdev, 1, | 779 | mp->m_logdev_targp = xfs_alloc_buftarg(mp, logdev); |
781 | mp->m_fsname); | ||
782 | if (!mp->m_logdev_targp) | 780 | if (!mp->m_logdev_targp) |
783 | goto out_free_rtdev_targ; | 781 | goto out_free_rtdev_targ; |
784 | } else { | 782 | } else { |