diff options
| author | Sunil Mushran <sunil.mushran@oracle.com> | 2009-02-26 15:00:48 -0800 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2009-04-03 11:39:24 -0700 |
| commit | 516b7e52abc7efd61c084b217c61985a403828ed (patch) | |
| tree | 80bd45f16b00bd009e6a0306cec430d0ef7b49bc | |
| parent | 7141514b8307734c117f100c4a3637887c5def45 (diff) | |
| download | linux-3.10-516b7e52abc7efd61c084b217c61985a403828ed.tar.gz linux-3.10-516b7e52abc7efd61c084b217c61985a403828ed.tar.bz2 linux-3.10-516b7e52abc7efd61c084b217c61985a403828ed.zip | |
ocfs2/dlm: Do not purge lockres that is being migrated dlm_purge_lockres()
This patch attempts to fix a fine race between purging and migration.
Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
| -rw-r--r-- | fs/ocfs2/dlm/dlmthread.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/fs/ocfs2/dlm/dlmthread.c b/fs/ocfs2/dlm/dlmthread.c index 4060bb328bc..d490b66ad9d 100644 --- a/fs/ocfs2/dlm/dlmthread.c +++ b/fs/ocfs2/dlm/dlmthread.c @@ -162,12 +162,28 @@ static int dlm_purge_lockres(struct dlm_ctxt *dlm, spin_lock(&res->spinlock); if (!__dlm_lockres_unused(res)) { - spin_unlock(&res->spinlock); mlog(0, "%s:%.*s: tried to purge but not unused\n", dlm->name, res->lockname.len, res->lockname.name); - return -ENOTEMPTY; + __dlm_print_one_lock_resource(res); + spin_unlock(&res->spinlock); + BUG(); } + + if (res->state & DLM_LOCK_RES_MIGRATING) { + mlog(0, "%s:%.*s: Delay dropref as this lockres is " + "being remastered\n", dlm->name, res->lockname.len, + res->lockname.name); + /* Re-add the lockres to the end of the purge list */ + if (!list_empty(&res->purge)) { + list_del_init(&res->purge); + list_add_tail(&res->purge, &dlm->purge_list); + } + spin_unlock(&res->spinlock); + return 0; + } + master = (res->owner == dlm->node_num); + if (!master) res->state |= DLM_LOCK_RES_DROPPING_REF; spin_unlock(&res->spinlock); |