Skip to contentSkip to conversation

Return error in case flock_lock_file failure

PATCH New Kirill Korotaev 1 participant 1 message Jun 14, 2006

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

PATCH 1/1 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.

fs/locks.c renamed from fs/locks.c.flfix +2 -0
@@ -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();