---

yaml --- r: 92968 b: refs/heads/master c: 1908555 h: refs/heads/master v: v3
git-mirror · Apr 25, 2008 · ac8861f · ac8861f
1 parent c82d74c
commit ac8861f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 288b2fd8251cb0bcb14b8a93755ef9c78de70e0f
+refs/heads/master: 190855576743a510219fc67886dace29b825d8cb
diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c
@@ -1368,18 +1368,18 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp)
 	lease = *flp;
 
 	if (arg != F_UNLCK) {
+		error = -ENOMEM;
+		new_fl = locks_alloc_lock();
+		if (new_fl == NULL)
+			goto out;
+
 		error = -EAGAIN;
 		if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0))
 			goto out;
 		if ((arg == F_WRLCK)
 		    && ((atomic_read(&dentry->d_count) > 1)
 			|| (atomic_read(&inode->i_count) > 1)))
 			goto out;
-
-		error = -ENOMEM;
-		new_fl = locks_alloc_lock();
-		if (new_fl == NULL)
-			goto out;
 	}
 
 	/*