aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_mount.c
diff options
context:
space:
mode:
authorDave Chinner <dchinner@redhat.com>2012-04-23 01:58:49 -0400
committerBen Myers <bpm@sgi.com>2012-05-14 17:20:45 -0400
commite70b73f84f474cc594a39bd8ff083974e6d69aea (patch)
tree0d365698ca2b6542aab8ca92c8e1f23b9c43da55 /fs/xfs/xfs_mount.c
parentbf813cdddfb3a5bc88e1612e8f62a12367871213 (diff)
xfs: clean up buffer get/read call API
The xfs_buf_get/read API is not consistent in the units it uses, and does not use appropriate or consistent units/types for the variables. Convert the API to use disk addresses and block counts for all buffer get and read calls. Use consistent naming for all the functions and their declarations, and convert the internal functions to use disk addresses and block counts to avoid need to convert them from one type to another and back again. Fix all the callers to use disk addresses and block counts. In many cases, this removes an additional conversion from the function call as the callers already have a block count. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Mark Tinguely <tinguely@sgi.com> Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_mount.c')
-rw-r--r--fs/xfs/xfs_mount.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 385a3b11d3dd..89be5ff57907 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -684,8 +684,8 @@ xfs_readsb(xfs_mount_t *mp, int flags)
684 sector_size = xfs_getsize_buftarg(mp->m_ddev_targp); 684 sector_size = xfs_getsize_buftarg(mp->m_ddev_targp);
685 685
686reread: 686reread:
687 bp = xfs_buf_read_uncached(mp, mp->m_ddev_targp, 687 bp = xfs_buf_read_uncached(mp->m_ddev_targp, XFS_SB_DADDR,
688 XFS_SB_DADDR, sector_size, 0); 688 BTOBB(sector_size), 0);
689 if (!bp) { 689 if (!bp) {
690 if (loud) 690 if (loud)
691 xfs_warn(mp, "SB buffer read failed"); 691 xfs_warn(mp, "SB buffer read failed");
@@ -1033,9 +1033,9 @@ xfs_check_sizes(xfs_mount_t *mp)
1033 xfs_warn(mp, "filesystem size mismatch detected"); 1033 xfs_warn(mp, "filesystem size mismatch detected");
1034 return XFS_ERROR(EFBIG); 1034 return XFS_ERROR(EFBIG);
1035 } 1035 }
1036 bp = xfs_buf_read_uncached(mp, mp->m_ddev_targp, 1036 bp = xfs_buf_read_uncached(mp->m_ddev_targp,
1037 d - XFS_FSS_TO_BB(mp, 1), 1037 d - XFS_FSS_TO_BB(mp, 1),
1038 BBTOB(XFS_FSS_TO_BB(mp, 1)), 0); 1038 XFS_FSS_TO_BB(mp, 1), 0);
1039 if (!bp) { 1039 if (!bp) {
1040 xfs_warn(mp, "last sector read failed"); 1040 xfs_warn(mp, "last sector read failed");
1041 return EIO; 1041 return EIO;
@@ -1048,9 +1048,9 @@ xfs_check_sizes(xfs_mount_t *mp)
1048 xfs_warn(mp, "log size mismatch detected"); 1048 xfs_warn(mp, "log size mismatch detected");
1049 return XFS_ERROR(EFBIG); 1049 return XFS_ERROR(EFBIG);
1050 } 1050 }
1051 bp = xfs_buf_read_uncached(mp, mp->m_logdev_targp, 1051 bp = xfs_buf_read_uncached(mp->m_logdev_targp,
1052 d - XFS_FSB_TO_BB(mp, 1), 1052 d - XFS_FSB_TO_BB(mp, 1),
1053 XFS_FSB_TO_B(mp, 1), 0); 1053 XFS_FSB_TO_BB(mp, 1), 0);
1054 if (!bp) { 1054 if (!bp) {
1055 xfs_warn(mp, "log device read failed"); 1055 xfs_warn(mp, "log device read failed");
1056 return EIO; 1056 return EIO;