projects / people / pmueller / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 00e5a55c BS |
1 | From: Sunil Mushran <sunil.mushran@oracle.com> |
| 2 | Date: Tue, 3 Feb 2009 12:37:15 -0800 | |
| 3 | Subject: [PATCH] ocfs2/dlm: Use ast_lock to protect ast_list | |
| 4 | Patch-mainline: 2.6.29 | |
| 5 | ||
| 6 | The code was using dlm->spinlock instead of dlm->ast_lock to protect the | |
| 7 | ast_list. This patch fixes the issue. | |
| 8 | ||
| 9 | Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com> | |
| 10 | Acked-by: Joel Becker <joel.becker@oracle.com> | |
| 11 | Signed-off-by: Mark Fasheh <mfasheh@suse.com> | |
| 12 | --- | |
| 13 | fs/ocfs2/dlm/dlmunlock.c | 4 ++-- | |
| 14 | 1 files changed, 2 insertions(+), 2 deletions(-) | |
| 15 | ||
| 16 | Index: linux-2.6.27-sle11_ocfs2_update2/fs/ocfs2/dlm/dlmunlock.c | |
| 17 | =================================================================== | |
| 18 | --- linux-2.6.27-sle11_ocfs2_update2.orig/fs/ocfs2/dlm/dlmunlock.c | |
| 19 | +++ linux-2.6.27-sle11_ocfs2_update2/fs/ocfs2/dlm/dlmunlock.c | |
| 20 | @@ -117,11 +117,11 @@ static enum dlm_status dlmunlock_common( | |
| 21 | else | |
| 22 | BUG_ON(res->owner == dlm->node_num); | |
| 23 | ||
| 24 | - spin_lock(&dlm->spinlock); | |
| 25 | + spin_lock(&dlm->ast_lock); | |
| 26 | /* We want to be sure that we're not freeing a lock | |
| 27 | * that still has AST's pending... */ | |
| 28 | in_use = !list_empty(&lock->ast_list); | |
| 29 | - spin_unlock(&dlm->spinlock); | |
| 30 | + spin_unlock(&dlm->ast_lock); | |
| 31 | if (in_use) { | |
| 32 | mlog(ML_ERROR, "lockres %.*s: Someone is calling dlmunlock " | |
| 33 | "while waiting for an ast!", res->lockname.len, |