[PATCH 14/27] xfs: rename libxfs_buftarg_init to libxfs_open_devices()

Dave Chinner
2020-10-15T07:22:11Z

This matches the kernel function for allocating the buftargs for
each device. The userspace function takes a bunch of devices, so
the new name matches what it does much more closely.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
copy/xfs_copy.c | 2 +-
db/init.c | 2 +-
db/sb.c | 2 +-
libxfs/init.c | 4 ++--
libxfs/libxfs_io.h | 2 +-
logprint/logprint.c | 2 +-
mkfs/xfs_mkfs.c | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/copy/xfs_copy.c b/copy/xfs_copy.c
index f5eff96976d7..5d72e6451650 100644
--- a/copy/xfs_copy.c
+++ b/copy/xfs_copy.c
@@ -733,7 +733,7 @@ main(int argc, char **argv)
memset(&mbuf, 0, sizeof(xfs_mount_t));

/* We don't yet know the sector size, so read maximal size */
- libxfs_buftarg_init(&mbuf, xargs.ddev, xargs.logdev, xargs.rtdev);
+ libxfs_open_devices(&mbuf, xargs.ddev, xargs.logdev, xargs.rtdev);
error = -libxfs_buf_read_uncached(mbuf.m_ddev_targp, XFS_SB_DADDR,
1 << (XFS_MAX_SECTORSIZE_LOG - BBSHIFT), 0, &sbp, NULL);
if (error) {
diff --git a/db/init.c b/db/init.c
index f797df8a768b..f45e34401069 100644
--- a/db/init.c
+++ b/db/init.c
@@ -109,7 +109,7 @@ init(
* tool and so need to be able to mount busted filesystems.
*/
memset(&xmount, 0, sizeof(struct xfs_mount));
- libxfs_buftarg_init(&xmount, x.ddev, x.logdev, x.rtdev);
+ libxfs_open_devices(&xmount, x.ddev, x.logdev, x.rtdev);
error = -libxfs_buf_read_uncached(xmount.m_ddev_targp, XFS_SB_DADDR,
1 << (XFS_MAX_SECTORSIZE_LOG - BBSHIFT), 0, &bp, NULL);
if (error) {
diff --git a/db/sb.c b/db/sb.c
index 8a303422b427..82f989606ba2 100644
--- a/db/sb.c
+++ b/db/sb.c
@@ -233,7 +233,7 @@ sb_logcheck(void)
}
}

- libxfs_buftarg_init(mp, x.ddev, x.logdev, x.rtdev);
+ libxfs_open_devices(mp, x.ddev, x.logdev, x.rtdev);

dirty = xlog_is_dirty(mp, mp->m_log, &x, 0);
if (dirty == -1) {
diff --git a/libxfs/init.c b/libxfs/init.c
index 3ab622e9ee3b..59c0f9df586b 100644
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -591,7 +591,7 @@ out_unwind:
}

void
-libxfs_buftarg_init(
+libxfs_open_devices(
struct xfs_mount *mp,
dev_t dev,
dev_t logdev,
@@ -715,7 +715,7 @@ libxfs_mount(
bool debugger = (flags & LIBXFS_MOUNT_DEBUGGER);
int error;

- libxfs_buftarg_init(mp, dev, logdev, rtdev);
+ libxfs_open_devices(mp, dev, logdev, rtdev);

mp->m_finobt_nores = true;
mp->m_flags = (LIBXFS_MOUNT_32BITINODES|LIBXFS_MOUNT_32BITINOOPT);
diff --git a/libxfs/libxfs_io.h b/libxfs/libxfs_io.h
index eeca8895b1d3..0f9630e8e17a 100644
--- a/libxfs/libxfs_io.h
+++ b/libxfs/libxfs_io.h
@@ -16,7 +16,7 @@ struct xfs_mount;
struct xfs_perag;
struct xfs_buftarg;

-void libxfs_buftarg_init(struct xfs_mount *mp, dev_t ddev,
+void libxfs_open_devices(struct xfs_mount *mp, dev_t ddev,
dev_t logdev, dev_t rtdev);
int libxfs_blkdev_issue_flush(struct xfs_buftarg *btp);

diff --git a/logprint/logprint.c b/logprint/logprint.c
index e882c5d44397..0e8512f6a854 100644
--- a/logprint/logprint.c
+++ b/logprint/logprint.c
@@ -212,7 +212,7 @@ main(int argc, char **argv)
exit(1);

logstat(&mount);
- libxfs_buftarg_init(&mount, x.ddev, x.logdev, x.rtdev);
+ libxfs_open_devices(&mount, x.ddev, x.logdev, x.rtdev);

logfd = (x.logfd < 0) ? x.dfd : x.logfd;

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index e094c82f86b7..794955a9624c 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -3986,7 +3986,7 @@ main(
/*
* we need the libxfs buffer cache from here on in.
*/
- libxfs_buftarg_init(mp, xi.ddev, xi.logdev, xi.rtdev);
+ libxfs_open_devices(mp, xi.ddev, xi.logdev, xi.rtdev);

/*
* Before we mount the filesystem we need to make sure the devices have
--
2.28.0