b=23127 osc lock granted fix

[fs/lustre-release.git] / lustre / osc / osc_lock.c

diff --git a/lustre/osc/osc_lock.c b/lustre/osc/osc_lock.c
index 5685124..254d02e 100644 (file)
--- a/lustre/osc/osc_lock.c
+++ b/lustre/osc/osc_lock.c
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -240,9 +240,9 @@ void osc_lock_build_res(const struct lu_env *env, const struct osc_object *obj,
         } else {
                 /*
                  * In reality, where ost server expects ->lsm_object_id and
-                 * ->lsm_object_gr in rename.
+                 * ->lsm_object_seq in rename.
                  */
-                osc_build_res_name(obj->oo_oinfo->loi_id, obj->oo_oinfo->loi_gr,
+                osc_build_res_name(obj->oo_oinfo->loi_id, obj->oo_oinfo->loi_seq,
                                    resname);
         }
 }
@@ -408,7 +408,7 @@ static void osc_lock_granted(const struct lu_env *env, struct osc_lock *olck,
         LASSERT(dlmlock->l_granted_mode == dlmlock->l_req_mode);
 
         ENTRY;
-        if (olck->ols_state != OLS_GRANTED) {
+        if (olck->ols_state < OLS_GRANTED) {
                 lock  = olck->ols_cl.cls_lock;
                 ext   = &dlmlock->l_policy_data.l_extent;
                 descr = &osc_env_info(env)->oti_descr;