Skip to contentSkip to conversation

2.6.23-rc7-mm1: fix generic_setlease() mismerge

PATCH Alexey Dobriyan 1 participant 1 message Sep 24, 2007

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Please, try this:

fs/locks.c +0 -5
@@ -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