ocfs2: Fix quota file corruption
PATCH 1/1 ocfs2: Fix quota file corruption
Global quota files are accessed from different nodes. Thus we cannot cache offset of quota structure in the quota file after we drop our node reference count to it because after that moment quota structure may be freed and reallocated elsewhere by a different node resulting in corruption of quota file.
Fix the problem by clearing dq_off when we are releasing dquot structure. We also remove the DB_READ_B handling because it is useless - DQ_ACTIVE_B is set iff DQ_READ_B is set.
--- fs/ocfs2/quota_global.c | 27 +++++++++++++++++---------- fs/ocfs2/quota_local.c | 4 ---- 2 files changed, 17 insertions(+), 14 deletions(-)
fs/ocfs2/quota_global.c +17 -10
@@ -717,6 +717,12 @@ static int ocfs2_release_dquot(struct dquot *dquot)*/ if (status <0 )mlog_errno (status); +/* +* Clear dq_off so that we search for the structure in quota file next +* time we acquire it. The structure might be deleted and reallocated +* elsewhere by another node while our dquot structure is on freelist. +*/ + dquot->dq_off =0 ;clear_bit (DQ_ACTIVE_B , &dquot->dq_flags); out_trans:ocfs2_commit_trans (osb, handle);
@@ -756,16 +762,17 @@ static int ocfs2_acquire_dquot(struct dquot *dquot) status =ocfs2_lock_global_qf (info,1 );if (status <0 ) goto out; -if (!test_bit (DQ_READ_B , &dquot->dq_flags)) { - status =ocfs2_qinfo_lock (info,0 ); -if (status <0 ) - goto out_dq; - status =qtree_read_dquot (&info->dqi_gi, dquot); -ocfs2_qinfo_unlock (info,0 ); -if (status <0 ) - goto out_dq; - } -set_bit (DQ_READ_B , &dquot->dq_flags); + status =ocfs2_qinfo_lock (info,0 ); +if (status <0 ) + goto out_dq; +/* +* We always want to read dquot structure from disk because we don't +* know what happened with it while it was on freelist. +*/ + status =qtree_read_dquot (&info->dqi_gi, dquot); +ocfs2_qinfo_unlock (info,0 ); +if (status <0 ) + goto out_dq;OCFS2_DQUOT (dquot)->dq_use_count++;OCFS2_DQUOT (dquot)->dq_origspace = dquot->dq_dqb.dqb_curspace;
fs/ocfs2/quota_local.c +0 -4
@@ -1303,10 +1303,6 @@ int ocfs2_local_release_dquot(handle_t *handle, struct dquot *dquot)ocfs2_journal_dirty (handle, od->dq_chunk->qc_headerbh); out: -/* Clear the read bit so that next time someone uses this -* dquot he reads fresh info from disk and allocates local -* dquot structure */ -clear_bit (DQ_READ_B , &dquot->dq_flags);return status; }
Signature · 1 line
1.8.1.4
PATCH 1/1 ocfs2: Fix quota file corruption
Quoted 6 lines · Jan Kara
Global quota files are accessed from different nodes. Thus we cannot cache offset of quota structure in the quota file after we drop our node reference count to it because after that moment quota structure may be freed and reallocated elsewhere by a different node resulting in corruption of quota file.
Quoted 8 lines
Fix the problem by clearing
dq_offwhen we are releasing dquot structure. We also remove theDB_READ_Bhandling because it is useless -DQ_ACTIVE_Bis set iffDQ_READ_Bis set.CC stable at vger.kernel.orgCC Goldwyn Rodrigues <[email protected]>CC Mark Fasheh <[email protected]>Signed-off-by Jan Kara <[email protected]>
Thanks Jan, this looks good.
--Mark
--
Mark Fasheh