NLM: Fix nlmclnt_test to not copy private part of locks

The struct file_lock does not carry a properly initialised lock,
so don't copy it as if it were.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index 8af0171058543bb5ada7038e63ef9e1ce558548e..7a239864b8bfb3377b9a14a3f020eee974269efd 100644 (file)
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -434,7 +434,9 @@ nlmclnt_test(struct nlm_rqst *req, struct file_lock *fl)
                /*
                 * Report the conflicting lock back to the application.
                 */
-               locks_copy_lock(fl, &req->a_res.lock.fl);
+               fl->fl_start = req->a_res.lock.fl.fl_start;
+               fl->fl_end = req->a_res.lock.fl.fl_start;
+               fl->fl_type = req->a_res.lock.fl.fl_type;
                fl->fl_pid = 0;
        } else {
                return nlm_stat_to_errno(req->a_res.status);

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index ee140c53dba6e00a188e4e4f819e5e6b4c304be1..6bcbc4d676c485b1fde50f48df52c18f00b65ce5 100644 (file)
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -399,7 +399,10 @@ static int do_getlk(struct file *filp, int cmd, struct file_lock *fl)
        lock_kernel();
        /* Try local locking first */
        if (posix_test_lock(filp, fl, &cfl)) {
-               locks_copy_lock(fl, &cfl);
+               fl->fl_start = cfl.fl_start;
+               fl->fl_end = cfl.fl_end;
+               fl->fl_type = cfl.fl_type;
+               fl->fl_pid = cfl.fl_pid;
                goto out;
        }