- send the lock value block over the wire in the "enqueue" reply

- store it in the lock on the client
- use the same struct for filter/llite (ost_lvb)
- replace separate files with a single lock_desc in the reply
- add some plumbing to ldlm_cli_create et al to pass LVB size down

diff --git a/lustre/ldlm/ldlm_flock.c b/lustre/ldlm/ldlm_flock.c
index 57c09c5..9a2f6a5 100644 (file)
--- a/lustre/ldlm/ldlm_flock.c
+++ b/lustre/ldlm/ldlm_flock.c
@@ -312,7 +312,8 @@ ldlm_process_flock_lock(struct ldlm_lock *req, int *flags, int first_enq,
                  * release the ns_lock, allocate the new lock,
                  * and restart processing this lock. */
                 new2 = ldlm_lock_create(ns, NULL, res->lr_name, LDLM_FLOCK,
-                                        lock->l_granted_mode, NULL, NULL, NULL);
+                                        lock->l_granted_mode, NULL, NULL, NULL,
+                                        0);
                 if (!new2) {
                         ldlm_flock_destroy(req, lock->l_granted_mode, *flags);
                         *err = -ENOLCK;