Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cedc194 authored by Kirill Korotaev's avatar Kirill Korotaev Committed by Linus Torvalds
Browse files

[PATCH] Return error in case flock_lock_file failure 



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: default avatarPavel Emelianov <xemul@openvz.org>
Signed-off-by: default avatarKirill Korotaev <dev@openvz.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent eb35cf60

fs/locks.c

+2 −0
Original line number Diff line number Diff line
@@ -755,6 +755,7 @@ static int flock_lock_file(struct file *filp, struct file_lock *request) 
	if (request->fl_type == F_UNLCK)

		goto out;



	error = -ENOMEM;

	new_fl = locks_alloc_lock();

	if (new_fl == NULL)

		goto out;
@@ -781,6 +782,7 @@ static int flock_lock_file(struct file *filp, struct file_lock *request) 
	locks_copy_lock(new_fl, request);

	locks_insert_lock(&inode->i_flock, new_fl);

	new_fl = NULL;

	error = 0;



out:

	unlock_kernel();