LU-2144 utils: reset 'optind' to avoid segmentation fault

[fs/lustre-release.git] / lustre / ldlm / l_lock.c

diff --git a/lustre/ldlm/l_lock.c b/lustre/ldlm/l_lock.c
index 2c0865f..d1de7d1 100644 (file)
--- a/lustre/ldlm/l_lock.c
+++ b/lustre/ldlm/l_lock.c
@@ -50,18 +50,22 @@
  */
 struct ldlm_resource * lock_res_and_lock(struct ldlm_lock *lock)
 {
-        /* on server-side resource of lock doesn't change */
-        if (!lock->l_ns_srv)
-                cfs_spin_lock(&lock->l_lock);
+       /* on server-side resource of lock doesn't change */
+       if (!lock->l_ns_srv)
+               cfs_spin_lock(&lock->l_lock);
 
-        lock_res(lock->l_resource);
-        return lock->l_resource;
+       lock_res(lock->l_resource);
+
+       lock->l_res_locked = 1;
+       return lock->l_resource;
 }
 
 void unlock_res_and_lock(struct ldlm_lock *lock)
 {
-        /* on server-side resource of lock doesn't change */
-        unlock_res(lock->l_resource);
-        if (!lock->l_ns_srv)
-                cfs_spin_unlock(&lock->l_lock);
+       /* on server-side resource of lock doesn't change */
+       lock->l_res_locked = 0;
+
+       unlock_res(lock->l_resource);
+       if (!lock->l_ns_srv)
+               cfs_spin_unlock(&lock->l_lock);
 }