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 (parent:
589bc6c
)
b=22147 do not reset owner for lockless lock.
author
Eric Mei
<eric.mei@oracle.com>
Thu, 15 Apr 2010 05:39:44 +0000
(22:39 -0700)
committer
Robert Read
<robert.read@oracle.com>
Thu, 15 Apr 2010 05:39:44 +0000
(22:39 -0700)
r=wangdi
r=vitaly
lustre/osc/osc_lock.c
patch
|
blob
|
history
diff --git
a/lustre/osc/osc_lock.c
b/lustre/osc/osc_lock.c
index
0d4e383
..
26a2d2d
100644
(file)
--- a/
lustre/osc/osc_lock.c
+++ b/
lustre/osc/osc_lock.c
@@
-1558,8
+1558,7
@@
static void osc_lock_lockless_state(const struct lu_env *env,
* host object */
if (cl_object_same(oio->oi_cl.cis_obj, slice->cls_obj))
oio->oi_lockless = 1;
* host object */
if (cl_object_same(oio->oi_cl.cis_obj, slice->cls_obj))
oio->oi_lockless = 1;
- } else
- lock->ols_owner = NULL;
+ }
}
static int osc_lock_lockless_fits_into(const struct lu_env *env,
}
static int osc_lock_lockless_fits_into(const struct lu_env *env,
@@
-1572,9
+1571,7
@@
static int osc_lock_lockless_fits_into(const struct lu_env *env,
if (!(need->cld_enq_flags & CEF_NEVER))
return 0;
if (!(need->cld_enq_flags & CEF_NEVER))
return 0;
- /* To solve the problem of stacking echo client upon osc directly.
- * see bug 22147 for details.
- */
+ /* lockless lock should only be used by its owning io. b22147 */
return (lock->ols_owner == osc_env_io(env));
}
return (lock->ols_owner == osc_env_io(env));
}