locks: give posix_test_lock same interface as ->lock

posix_test_lock() and ->lock() do the same job but have gratuitously
different interfaces.  Modify posix_test_lock() so the two agree,
simplifying some code in the process.

Signed-off-by: Marc Eshel <eshel@almaden.ibm.com>
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>

1 files changed, 8 insertions, 5 deletions

diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index cf51f849e76c..97b0160ef10f 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -426,15 +426,18 @@ nlmsvc_testlock(struct nlm_file *file, struct nlm_lock *lock,
                                 (long long)lock->fl.fl_start,
                                 (long long)lock->fl.fl_end);
 
-        if (posix_test_lock(file->f_file, &lock->fl, &conflock->fl)) {
+        if (posix_test_lock(file->f_file, &lock->fl)) {
                 dprintk("lockd: conflicting lock(ty=%d, %Ld-%Ld)\n",
-                                conflock->fl.fl_type,
-                                (long long)conflock->fl.fl_start,
-                                (long long)conflock->fl.fl_end);
+                                lock->fl.fl_type,
+                                (long long)lock->fl.fl_start,
+                                (long long)lock->fl.fl_end);
                 conflock->caller = "somehost";  /* FIXME */
                 conflock->len = strlen(conflock->caller);
                 conflock->oh.len = 0;           /* don't return OH info */
-                conflock->svid = conflock->fl.fl_pid;
+                conflock->svid = lock->fl.fl_pid;
+                conflock->fl.fl_type = lock->fl.fl_type;
+                conflock->fl.fl_start = lock->fl.fl_start;
+                conflock->fl.fl_end = lock->fl.fl_end;
                 return nlm_lck_denied;
         }