lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[XFS] Report errors from xfs_reserve_blocks().

Browse Source 
xfs_reserve_blocks() can fail in interesting ways. In neither case is it a
fatal error, but the result can lead to sub-optimal behaviour. Warn to the
syslog if the call fails but otherwise continue.

SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30784a

Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Niv Sardi <xaiki@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
This commit is contained in:
David Chinner
2008-04-10 12:20:03 +10:00
committed by Lachlan McIlroy
parent 36fbe6e6bd
commit 714082bc12
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fs/xfs/xfs_mount.c
View File

@@ -1227,12 +1227,15 @@ xfs_mountfs(
* *
* We default to 5% or 1024 fsbs of space reserved, whichever is smaller. * We default to 5% or 1024 fsbs of space reserved, whichever is smaller.
* This may drive us straight to ENOSPC on mount, but that implies * This may drive us straight to ENOSPC on mount, but that implies
* we were already there on the last unmount. * we were already there on the last unmount. Warn if this occurs.
*/ */
resblks = mp->m_sb.sb_dblocks; resblks = mp->m_sb.sb_dblocks;
do_div(resblks, 20); do_div(resblks, 20);
resblks = min_t(__uint64_t, resblks, 1024); resblks = min_t(__uint64_t, resblks, 1024);
xfs_reserve_blocks(mp, &resblks, NULL); error = xfs_reserve_blocks(mp, &resblks, NULL);
if (error)
cmn_err(CE_WARN, "XFS: Unable to allocate reserve blocks. "
"Continuing without a reserve pool.");
return 0; return 0;
@@ -1268,6 +1271,7 @@ int
xfs_unmountfs(xfs_mount_t *mp, struct cred *cr) xfs_unmountfs(xfs_mount_t *mp, struct cred *cr)
{ {
__uint64_t resblks; __uint64_t resblks;
int error = 0;
/* /*
* We can potentially deadlock here if we have an inode cluster * We can potentially deadlock here if we have an inode cluster
@@ -1311,7 +1315,11 @@ xfs_unmountfs(xfs_mount_t *mp, struct cred *cr)
* value does not matter.... * value does not matter....
*/ */
resblks = 0; resblks = 0;
xfs_reserve_blocks(mp, &resblks, NULL); error = xfs_reserve_blocks(mp, &resblks, NULL);
if (error)
cmn_err(CE_WARN, "XFS: Unable to free reserved block pool. "
"Freespace may not be correct on next mount.");
xfs_log_sbcount(mp, 1); xfs_log_sbcount(mp, 1);
xfs_unmountfs_writesb(mp); xfs_unmountfs_writesb(mp);