git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
[pandora-kernel.git]
/
fs
/
ocfs2
/
dlm
/
dlmmaster.c
diff --git
a/fs/ocfs2/dlm/dlmmaster.c
b/fs/ocfs2/dlm/dlmmaster.c
index
b01e348
..
4a7506a
100644
(file)
--- a/
fs/ocfs2/dlm/dlmmaster.c
+++ b/
fs/ocfs2/dlm/dlmmaster.c
@@
-1873,7
+1873,6
@@
int dlm_assert_master_handler(struct o2net_msg *msg, u32 len, void *data,
ok:
spin_unlock(&res->spinlock);
}
ok:
spin_unlock(&res->spinlock);
}
- spin_unlock(&dlm->spinlock);
// mlog(0, "woo! got an assert_master from node %u!\n",
// assert->node_idx);
// mlog(0, "woo! got an assert_master from node %u!\n",
// assert->node_idx);
@@
-1924,7
+1923,6
@@
ok:
/* master is known, detach if not already detached.
* ensures that only one assert_master call will happen
* on this mle. */
/* master is known, detach if not already detached.
* ensures that only one assert_master call will happen
* on this mle. */
- spin_lock(&dlm->spinlock);
spin_lock(&dlm->master_lock);
rr = atomic_read(&mle->mle_refs.refcount);
spin_lock(&dlm->master_lock);
rr = atomic_read(&mle->mle_refs.refcount);
@@
-1957,7
+1955,6
@@
ok:
__dlm_put_mle(mle);
}
spin_unlock(&dlm->master_lock);
__dlm_put_mle(mle);
}
spin_unlock(&dlm->master_lock);
- spin_unlock(&dlm->spinlock);
} else if (res) {
if (res->owner != assert->node_idx) {
mlog(0, "assert_master from %u, but current "
} else if (res) {
if (res->owner != assert->node_idx) {
mlog(0, "assert_master from %u, but current "
@@
-1965,6
+1962,7
@@
ok:
res->owner, namelen, name);
}
}
res->owner, namelen, name);
}
}
+ spin_unlock(&dlm->spinlock);
done:
ret = 0;
done:
ret = 0;