2007-09-24 13:12:34

by Alexey Dobriyan

[permalink] [raw]
Subject: 2.6.23-rc7-mm1: fix generic_setlease() mismerge

Please, try this:

--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1373,11 +1373,6 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp)
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