* 2.6.23-rc7-mm1: fix generic_setlease() mismerge
@ 2007-09-24 13:09 Alexey Dobriyan
0 siblings, 0 replies; only message in thread
From: Alexey Dobriyan @ 2007-09-24 13:09 UTC (permalink / raw)
To: akpm, kamalesh; +Cc: linux-kernel, xemul
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-09-24 13:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-24 13:09 2.6.23-rc7-mm1: fix generic_setlease() mismerge Alexey Dobriyan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox