patch-2.1.58 linux/fs/locks.c

• Lines: 20
• Date: Tue Oct 14 11:33:41 1997
• Orig file: v2.1.57/linux/fs/locks.c
• Orig date: Wed Sep 24 20:05:48 1997

diff -u --recursive --new-file v2.1.57/linux/fs/locks.c linux/fs/locks.c
@@ -881,9 +881,6 @@
 
 	if (caller->fl_type != F_UNLCK) {
   repeat:
-		error = -ERESTARTSYS;
-		if (signal_pending(current))
-			goto out;
 		for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) {
 			if (!(fl->fl_flags & FL_POSIX))
 				continue;
@@ -894,6 +891,9 @@
 				goto out;
 			error = -EDEADLK;
 			if (posix_locks_deadlock(caller, fl))
+				goto out;
+			error = -ERESTARTSYS;
+			if (signal_pending(current))
 				goto out;
 			locks_insert_block(fl, caller);
 			interruptible_sleep_on(&caller->fl_wait);