Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-13128 osc: glimpse and lock cancel race
[fs/lustre-release.git]
/
lustre
/
mdc
/
mdc_dev.c
diff --git
a/lustre/mdc/mdc_dev.c
b/lustre/mdc/mdc_dev.c
index
54ccb02
..
6ab9bca
100644
(file)
--- a/
lustre/mdc/mdc_dev.c
+++ b/
lustre/mdc/mdc_dev.c
@@
-323,7
+323,6
@@
static int mdc_dlm_blocking_ast0(const struct lu_env *env,
if (dlmlock->l_ast_data != NULL) {
obj = osc2cl(dlmlock->l_ast_data);
if (dlmlock->l_ast_data != NULL) {
obj = osc2cl(dlmlock->l_ast_data);
- dlmlock->l_ast_data = NULL;
cl_object_get(obj);
}
unlock_res_and_lock(dlmlock);
cl_object_get(obj);
}
unlock_res_and_lock(dlmlock);
@@
-341,6
+340,7
@@
static int mdc_dlm_blocking_ast0(const struct lu_env *env,
*/
/* losing a lock, update kms */
lock_res_and_lock(dlmlock);
*/
/* losing a lock, update kms */
lock_res_and_lock(dlmlock);
+ dlmlock->l_ast_data = NULL;
cl_object_attr_lock(obj);
attr->cat_kms = 0;
cl_object_attr_update(env, obj, attr, CAT_KMS);
cl_object_attr_lock(obj);
attr->cat_kms = 0;
cl_object_attr_update(env, obj, attr, CAT_KMS);