Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e8abdb3
)
b=21718 refer to osc_io only if lock was held.
author
Mikhail Pershin
<tappro@sun.com>
Wed, 17 Feb 2010 08:07:47 +0000
(11:07 +0300)
committer
Mikhail Pershin
<tappro@sun.com>
Wed, 17 Feb 2010 08:09:34 +0000
(11:09 +0300)
i=wangdi
i=ericm
lustre/osc/osc_lock.c
patch
|
blob
|
history
diff --git
a/lustre/osc/osc_lock.c
b/lustre/osc/osc_lock.c
index
c6e7942
..
b96b962
100644
(file)
--- a/
lustre/osc/osc_lock.c
+++ b/
lustre/osc/osc_lock.c
@@
-1469,13
+1469,14
@@
static void osc_lock_state(const struct lu_env *env,
enum cl_lock_state state)
{
struct osc_lock *lock = cl2osc_lock(slice);
enum cl_lock_state state)
{
struct osc_lock *lock = cl2osc_lock(slice);
- struct osc_io *oio = osc_env_io(env);
/*
* XXX multiple io contexts can use the lock at the same time.
*/
LINVRNT(osc_lock_invariant(lock));
if (state == CLS_HELD && slice->cls_lock->cll_state != CLS_HELD) {
/*
* XXX multiple io contexts can use the lock at the same time.
*/
LINVRNT(osc_lock_invariant(lock));
if (state == CLS_HELD && slice->cls_lock->cll_state != CLS_HELD) {
+ struct osc_io *oio = osc_env_io(env);
+
LASSERT(lock->ols_owner == NULL);
lock->ols_owner = oio;
} else if (state != CLS_HELD)
LASSERT(lock->ols_owner == NULL);
lock->ols_owner = oio;
} else if (state != CLS_HELD)
@@
-1607,10
+1608,11
@@
static void osc_lock_lockless_state(const struct lu_env *env,
enum cl_lock_state state)
{
struct osc_lock *lock = cl2osc_lock(slice);
enum cl_lock_state state)
{
struct osc_lock *lock = cl2osc_lock(slice);
- struct osc_io *oio = osc_env_io(env);
LINVRNT(osc_lock_invariant(lock));
if (state == CLS_HELD) {
LINVRNT(osc_lock_invariant(lock));
if (state == CLS_HELD) {
+ struct osc_io *oio = osc_env_io(env);
+
LASSERT(lock->ols_owner == NULL);
lock->ols_owner = oio;
LASSERT(lock->ols_owner == NULL);
lock->ols_owner = oio;