[PATCH] Return error in case flock_lock_file failure

[PATCH] Return error in case flock_lock_file failure

[Kirill Korotaev]

[-- Attachment #1: Type: text/plain, Size: 230 bytes --]

If flock_lock_file() failed to allocate flock with locks_alloc_lock()
then "error = 0" is returned. Need to return some non-zero.

Signed-Off-By: Pavel Emelianov <xemul@openvz.org>
Signed-Off-By: Kirill Korotaev <dev@openvz.org>


[-- Attachment #2: diff-ms-flock-lock-file-err-20060605 --]
[-- Type: text/plain, Size: 509 bytes --]

--- ./fs/locks.c.flfix	2006-06-05 12:09:42.000000000 +0400
+++ ./fs/locks.c	2006-06-05 12:27:20.000000000 +0400
@@ -705,6 +705,7 @@ static int flock_lock_file(struct file *
 	if (request->fl_type == F_UNLCK)
 		goto out;
 
+	error = -ENOMEM;
 	new_fl = locks_alloc_lock();
 	if (new_fl == NULL)
 		goto out;
@@ -731,6 +732,7 @@ static int flock_lock_file(struct file *
 	locks_copy_lock(new_fl, request);
 	locks_insert_lock(&inode->i_flock, new_fl);
 	new_fl = NULL;
+	error = 0;
 
 out:
 	unlock_kernel();