leases: fix a return-value mixup

Fixes a return-value mixup from 85c5958 "locks: Fix potential OOPS in generic_setlease()", in which -ENOMEM replaced what had been intended to stay -EAGAIN in the variable "error". Signed-off-by: David M. Richter <richterd@citi.umich.edu> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
mariux64 · Apr 25, 2008 · 5fcc60c · 5fcc60c
1 parent b69d398
commit 5fcc60c
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/fs/locks.c b/fs/locks.c
@@ -1404,6 +1404,7 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp)
 			rdlease_count++;
 	}
 
+	error = -EAGAIN;
 	if ((arg == F_RDLCK && (wrlease_count > 0)) ||
 	    (arg == F_WRLCK && ((rdlease_count + wrlease_count) > 0)))
 		goto out;