LU-6349 ptlrpc: remove old protocol compatibility

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

diff --git a/lustre/ldlm/ldlm_flock.c b/lustre/ldlm/ldlm_flock.c
index f2a0859..ac17c1a 100644 (file)
--- a/lustre/ldlm/ldlm_flock.c
+++ b/lustre/ldlm/ldlm_flock.c
@@ -840,28 +840,14 @@ int ldlm_flock_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
         RETURN(0);
 }
 
-void ldlm_flock_policy_wire18_to_local(const ldlm_wire_policy_data_t *wpolicy,
-                                       ldlm_policy_data_t *lpolicy)
+void ldlm_flock_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
+                                    ldlm_policy_data_t *lpolicy)
 {
-        memset(lpolicy, 0, sizeof(*lpolicy));
-        lpolicy->l_flock.start = wpolicy->l_flock.lfw_start;
-        lpolicy->l_flock.end = wpolicy->l_flock.lfw_end;
-        lpolicy->l_flock.pid = wpolicy->l_flock.lfw_pid;
-        /* Compat code, old clients had no idea about owner field and
-         * relied solely on pid for ownership. Introduced in LU-104, 2.1,
-         * April 2011 */
-        lpolicy->l_flock.owner = wpolicy->l_flock.lfw_pid;
-}
-
-
-void ldlm_flock_policy_wire21_to_local(const ldlm_wire_policy_data_t *wpolicy,
-                                       ldlm_policy_data_t *lpolicy)
-{
-        memset(lpolicy, 0, sizeof(*lpolicy));
-        lpolicy->l_flock.start = wpolicy->l_flock.lfw_start;
-        lpolicy->l_flock.end = wpolicy->l_flock.lfw_end;
-        lpolicy->l_flock.pid = wpolicy->l_flock.lfw_pid;
-        lpolicy->l_flock.owner = wpolicy->l_flock.lfw_owner;
+       memset(lpolicy, 0, sizeof(*lpolicy));
+       lpolicy->l_flock.start = wpolicy->l_flock.lfw_start;
+       lpolicy->l_flock.end = wpolicy->l_flock.lfw_end;
+       lpolicy->l_flock.pid = wpolicy->l_flock.lfw_pid;
+       lpolicy->l_flock.owner = wpolicy->l_flock.lfw_owner;
 }
 
 void ldlm_flock_policy_local_to_wire(const ldlm_policy_data_t *lpolicy,