diff options
author | David Chinner <dgc@sgi.com> | 2008-04-09 22:20:24 -0400 |
---|---|---|
committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-04-17 21:56:55 -0400 |
commit | 3c56836f92683cb871ebbf44c512069b0d48a08f (patch) | |
tree | ac0ef5d76e086aa6e2542fb5548db26af5967297 /fs/xfs/quota/xfs_qm.c | |
parent | 4b8879df8c21bed3efd1eb2da5d72501199aba29 (diff) |
[XFS] Check for dquot flush errors
xfs_qm_dqflush() can fail, but the return is not checked anywhere. Hence
we never know if we've failed to flush a dquot to disk. Propagate the
error and warn to the syslog if a flush ever fails.
SGI-PV: 980084
SGI-Modid: xfs-linux-melb:xfs-kern:30787a
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Niv Sardi <xaiki@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'fs/xfs/quota/xfs_qm.c')
-rw-r--r-- | fs/xfs/quota/xfs_qm.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c index 04b29c672141..0ed3c8277fcd 100644 --- a/fs/xfs/quota/xfs_qm.c +++ b/fs/xfs/quota/xfs_qm.c | |||
@@ -2094,12 +2094,17 @@ xfs_qm_shake_freelist( | |||
2094 | * dirty dquots. | 2094 | * dirty dquots. |
2095 | */ | 2095 | */ |
2096 | if (XFS_DQ_IS_DIRTY(dqp)) { | 2096 | if (XFS_DQ_IS_DIRTY(dqp)) { |
2097 | int error; | ||
2097 | xfs_dqtrace_entry(dqp, "DQSHAKE: DQDIRTY"); | 2098 | xfs_dqtrace_entry(dqp, "DQSHAKE: DQDIRTY"); |
2098 | /* | 2099 | /* |
2099 | * We flush it delayed write, so don't bother | 2100 | * We flush it delayed write, so don't bother |
2100 | * releasing the mplock. | 2101 | * releasing the mplock. |
2101 | */ | 2102 | */ |
2102 | (void) xfs_qm_dqflush(dqp, XFS_QMOPT_DELWRI); | 2103 | error = xfs_qm_dqflush(dqp, XFS_QMOPT_DELWRI); |
2104 | if (error) { | ||
2105 | xfs_fs_cmn_err(CE_WARN, dqp->q_mount, | ||
2106 | "xfs_qm_dqflush_all: dquot %p flush failed", dqp); | ||
2107 | } | ||
2103 | xfs_dqunlock(dqp); /* dqflush unlocks dqflock */ | 2108 | xfs_dqunlock(dqp); /* dqflush unlocks dqflock */ |
2104 | dqp = dqp->dq_flnext; | 2109 | dqp = dqp->dq_flnext; |
2105 | continue; | 2110 | continue; |
@@ -2266,12 +2271,17 @@ xfs_qm_dqreclaim_one(void) | |||
2266 | * dirty dquots. | 2271 | * dirty dquots. |
2267 | */ | 2272 | */ |
2268 | if (XFS_DQ_IS_DIRTY(dqp)) { | 2273 | if (XFS_DQ_IS_DIRTY(dqp)) { |
2274 | int error; | ||
2269 | xfs_dqtrace_entry(dqp, "DQRECLAIM: DQDIRTY"); | 2275 | xfs_dqtrace_entry(dqp, "DQRECLAIM: DQDIRTY"); |
2270 | /* | 2276 | /* |
2271 | * We flush it delayed write, so don't bother | 2277 | * We flush it delayed write, so don't bother |
2272 | * releasing the freelist lock. | 2278 | * releasing the freelist lock. |
2273 | */ | 2279 | */ |
2274 | (void) xfs_qm_dqflush(dqp, XFS_QMOPT_DELWRI); | 2280 | error = xfs_qm_dqflush(dqp, XFS_QMOPT_DELWRI); |
2281 | if (error) { | ||
2282 | xfs_fs_cmn_err(CE_WARN, dqp->q_mount, | ||
2283 | "xfs_qm_dqreclaim: dquot %p flush failed", dqp); | ||
2284 | } | ||
2275 | xfs_dqunlock(dqp); /* dqflush unlocks dqflock */ | 2285 | xfs_dqunlock(dqp); /* dqflush unlocks dqflock */ |
2276 | continue; | 2286 | continue; |
2277 | } | 2287 | } |