From: Alexey Dobriyan <adobriyan@sw.ru>

Please, try this:


Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/locks.c |    5 -----
 1 file changed, 5 deletions(-)

diff -puN fs/locks.c~git-nfsd-fix-generic_setlease-mismerge fs/locks.c
--- a/fs/locks.c~git-nfsd-fix-generic_setlease-mismerge
+++ a/fs/locks.c
@@ -1374,11 +1374,6 @@ int generic_setlease(struct file *filp, 
 	if (new_fl == NULL)
 		goto out;
 
-	error = -ENOMEM;
-	new_fl = locks_alloc_lock();
-	if (new_fl == NULL)
-		goto out;
-
 	/*
 	 * At this point, we know that if there is an exclusive
 	 * lease on this file, then we hold it on this filp
_