NLM: Fix nlmclnt_test to not copy private part of locks

[pandora-kernel.git] / fs / nfs / file.c

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index ee140c5..6bcbc4d 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;
        }