patch-2.0.1 linux/fs/locks.c

• Lines: 27
• Date: Tue Jul 2 19:08:42 1996
• Orig file: v2.0.0/linux/fs/locks.c
• Orig date: Sun Jun 9 13:28:46 1996

diff -u --recursive --new-file v2.0.0/linux/fs/locks.c linux/fs/locks.c
@@ -317,6 +317,8 @@
 		break;
 	case F_UNLCK :
 		break;
+	default:
+		return -EINVAL;
 	}
 	
 	return (posix_lock_file(filp, &file_lock, cmd == F_SETLKW));
@@ -448,7 +450,7 @@
 			if (current->signal & ~current->blocked)
 				return (-ERESTARTSYS);
 			if (posix_locks_deadlock(current, fl->fl_owner))
-				return (-EDEADLOCK);
+				return (-EDEADLK);
 			interruptible_sleep_on(&fl->fl_wait);
 			if (current->signal & ~current->blocked)
 				return (-ERESTARTSYS);
@@ -762,7 +764,7 @@
 				if (current->signal & ~current->blocked)
 					return (-ERESTARTSYS);
 				if (posix_locks_deadlock(caller->fl_owner, fl->fl_owner))
-					return (-EDEADLOCK);
+					return (-EDEADLK);
 				interruptible_sleep_on(&fl->fl_wait);
 				if (current->signal & ~current->blocked)
 					return (-ERESTARTSYS);