UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

xfs: use unhashed buffers for size checks 

When we are checking we can access the last block of each device, we
do not need to use cached buffers as they will be tossed away
immediately. Use uncached buffers for size checks so that all IO
prior to full in-memory structure initialisation does not use the
buffer cache.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Alex Elder <aelder@sgi.com>
This commit is contained in:
Dave Chinner 2010-09-22 10:47:20 +10:00 committed by Alex Elder
parent 26af655233
commit 1922c949c5
3 changed files with 34 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/xfs/xfs_fsops.c
View File

@ -144,12 +144,11 @@ xfs_growfs_data_private(
if ((error = xfs_sb_validate_fsb_count(&mp->m_sb, nb))) if ((error = xfs_sb_validate_fsb_count(&mp->m_sb, nb)))
return error; return error;
dpct = pct - mp->m_sb.sb_imax_pct; dpct = pct - mp->m_sb.sb_imax_pct;
error = xfs_read_buf(mp, mp->m_ddev_targp, bp = xfs_buf_read_uncached(mp, mp->m_ddev_targp,
XFS_FSB_TO_BB(mp, nb) - XFS_FSS_TO_BB(mp, 1), XFS_FSB_TO_BB(mp, nb) - XFS_FSS_TO_BB(mp, 1),
XFS_FSS_TO_BB(mp, 1), 0, &bp); BBTOB(XFS_FSS_TO_BB(mp, 1)), 0);
if (error) if (!bp)
return error; return EIO;
ASSERT(bp);
xfs_buf_relse(bp); xfs_buf_relse(bp);
new = nb; /* use new as a temporary here */ new = nb; /* use new as a temporary here */

39
fs/xfs/xfs_mount.c
View File

@ -980,42 +980,35 @@ xfs_check_sizes(xfs_mount_t *mp)
{ {
xfs_buf_t *bp; xfs_buf_t *bp;
xfs_daddr_t d; xfs_daddr_t d;
int error;
d = (xfs_daddr_t)XFS_FSB_TO_BB(mp, mp->m_sb.sb_dblocks); d = (xfs_daddr_t)XFS_FSB_TO_BB(mp, mp->m_sb.sb_dblocks);
if (XFS_BB_TO_FSB(mp, d) != mp->m_sb.sb_dblocks) { if (XFS_BB_TO_FSB(mp, d) != mp->m_sb.sb_dblocks) {
cmn_err(CE_WARN, "XFS: size check 1 failed"); cmn_err(CE_WARN, "XFS: filesystem size mismatch detected");
return XFS_ERROR(EFBIG); return XFS_ERROR(EFBIG);
} }
error = xfs_read_buf(mp, mp->m_ddev_targp, bp = xfs_buf_read_uncached(mp, mp->m_ddev_targp,
d - XFS_FSS_TO_BB(mp, 1), d - XFS_FSS_TO_BB(mp, 1),
XFS_FSS_TO_BB(mp, 1), 0, &bp); BBTOB(XFS_FSS_TO_BB(mp, 1)), 0);
if (!error) { if (!bp) {
xfs_buf_relse(bp); cmn_err(CE_WARN, "XFS: last sector read failed");
} else { return EIO;
cmn_err(CE_WARN, "XFS: size check 2 failed");
if (error == ENOSPC)
error = XFS_ERROR(EFBIG);
return error;
} }
xfs_buf_relse(bp);
if (mp->m_logdev_targp != mp->m_ddev_targp) { if (mp->m_logdev_targp != mp->m_ddev_targp) {
d = (xfs_daddr_t)XFS_FSB_TO_BB(mp, mp->m_sb.sb_logblocks); d = (xfs_daddr_t)XFS_FSB_TO_BB(mp, mp->m_sb.sb_logblocks);
if (XFS_BB_TO_FSB(mp, d) != mp->m_sb.sb_logblocks) { if (XFS_BB_TO_FSB(mp, d) != mp->m_sb.sb_logblocks) {
cmn_err(CE_WARN, "XFS: size check 3 failed"); cmn_err(CE_WARN, "XFS: log size mismatch detected");
return XFS_ERROR(EFBIG); return XFS_ERROR(EFBIG);
} }
error = xfs_read_buf(mp, mp->m_logdev_targp, bp = xfs_buf_read_uncached(mp, mp->m_logdev_targp,
d - XFS_FSB_TO_BB(mp, 1), d - XFS_FSB_TO_BB(mp, 1),
XFS_FSB_TO_BB(mp, 1), 0, &bp); XFS_FSB_TO_B(mp, 1), 0);
if (!error) { if (!bp) {
xfs_buf_relse(bp); cmn_err(CE_WARN, "XFS: log device read failed");
} else { return EIO;
cmn_err(CE_WARN, "XFS: size check 3 failed");
if (error == ENOSPC)
error = XFS_ERROR(EFBIG);
return error;
} }
xfs_buf_relse(bp);
} }
return 0; return 0;
} }

29
fs/xfs/xfs_rtalloc.c
View File

@ -39,6 +39,7 @@
#include "xfs_trans_space.h" #include "xfs_trans_space.h"
#include "xfs_utils.h" #include "xfs_utils.h"
#include "xfs_trace.h" #include "xfs_trace.h"
#include "xfs_buf.h"
/* /*
@ -1883,13 +1884,13 @@ xfs_growfs_rt(
/* /*
* Read in the last block of the device, make sure it exists. * Read in the last block of the device, make sure it exists.
*/ */
error = xfs_read_buf(mp, mp->m_rtdev_targp, bp = xfs_buf_read_uncached(mp, mp->m_rtdev_targp,
XFS_FSB_TO_BB(mp, nrblocks - 1), XFS_FSB_TO_BB(mp, nrblocks - 1),
XFS_FSB_TO_BB(mp, 1), 0, &bp); XFS_FSB_TO_B(mp, 1), 0);
if (error) if (!bp)
return error; return EIO;
ASSERT(bp);
xfs_buf_relse(bp); xfs_buf_relse(bp);
/* /*
* Calculate new parameters. These are the final values to be reached. * Calculate new parameters. These are the final values to be reached.
*/ */
@ -2215,7 +2216,6 @@ xfs_rtmount_init(
{ {
xfs_buf_t *bp; /* buffer for last block of subvolume */ xfs_buf_t *bp; /* buffer for last block of subvolume */
xfs_daddr_t d; /* address of last block of subvolume */ xfs_daddr_t d; /* address of last block of subvolume */
int error; /* error return value */
xfs_sb_t *sbp; /* filesystem superblock copy in mount */ xfs_sb_t *sbp; /* filesystem superblock copy in mount */
sbp = &mp->m_sb; sbp = &mp->m_sb;
@ -2242,15 +2242,12 @@ xfs_rtmount_init(
(unsigned long long) mp->m_sb.sb_rblocks); (unsigned long long) mp->m_sb.sb_rblocks);
return XFS_ERROR(EFBIG); return XFS_ERROR(EFBIG);
} }
error = xfs_read_buf(mp, mp->m_rtdev_targp, bp = xfs_buf_read_uncached(mp, mp->m_rtdev_targp,
d - XFS_FSB_TO_BB(mp, 1), d - XFS_FSB_TO_BB(mp, 1),
XFS_FSB_TO_BB(mp, 1), 0, &bp); XFS_FSB_TO_B(mp, 1), 0);
if (error) { if (!bp) {
cmn_err(CE_WARN, cmn_err(CE_WARN, "XFS: realtime device size check failed");
"XFS: realtime mount -- xfs_read_buf failed, returned %d", error); return EIO;
if (error == ENOSPC)
return XFS_ERROR(EFBIG);
return error;
} }
xfs_buf_relse(bp); xfs_buf_relse(bp);
return 0; return 0;