diff options
| author | Kurt Hackel <kurt.hackel@oracle.com> | 2006-05-01 13:30:49 -0700 |
|---|---|---|
| committer | Mark Fasheh <mark.fasheh@oracle.com> | 2006-06-26 14:43:07 -0700 |
| commit | c87a9ae7059f718bf1bb87a702fcbef535e32111 (patch) | |
| tree | 9e1a1604843b8dcde97ce392f2dc6bf50d8e70c0 /fs/ocfs2/dlm/dlmthread.c | |
| parent | 2abaf97e62e51fdd09d5a46703b3b680f24bdd8b (diff) | |
| download | linux-stable-c87a9ae7059f718bf1bb87a702fcbef535e32111.tar.gz linux-stable-c87a9ae7059f718bf1bb87a702fcbef535e32111.tar.bz2 linux-stable-c87a9ae7059f718bf1bb87a702fcbef535e32111.zip | |
ocfs2: temporarily disable automatic lock migration
Now we never change the owner of a lock resource until unmount or node
death. This will be re-enabled once some issues in the algorithm used have
been resolved.
Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/dlm/dlmthread.c')
| -rw-r--r-- | fs/ocfs2/dlm/dlmthread.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/fs/ocfs2/dlm/dlmthread.c b/fs/ocfs2/dlm/dlmthread.c index 610dc76a851b..c1c10fd1a5a7 100644 --- a/fs/ocfs2/dlm/dlmthread.c +++ b/fs/ocfs2/dlm/dlmthread.c @@ -106,6 +106,20 @@ void __dlm_lockres_calc_usage(struct dlm_ctxt *dlm, assert_spin_locked(&res->spinlock); if (__dlm_lockres_unused(res)){ + /* For now, just keep any resource we master */ + if (res->owner == dlm->node_num) + { + if (!list_empty(&res->purge)) { + mlog(0, "we master %s:%.*s, but it is on " + "the purge list. Removing\n", + dlm->name, res->lockname.len, + res->lockname.name); + list_del_init(&res->purge); + dlm->purge_count--; + } + return; + } + if (list_empty(&res->purge)) { mlog(0, "putting lockres %.*s from purge list\n", res->lockname.len, res->lockname.name); |