patch-1.3.89 linux/fs/namei.c

• Lines: 20
• Date: Sun Apr 14 14:48:53 1996
• Orig file: v1.3.88/linux/fs/namei.c
• Orig date: Wed Apr 10 17:02:25 1996

diff -u --recursive --new-file v1.3.88/linux/fs/namei.c linux/fs/namei.c
@@ -388,7 +388,8 @@
 	/* SunOS, Solaris 2.x and HPUX all deny open() on
 	 * an existing file with mandatory locks.
 	 */
-	if ((error = locks_verify_locked(inode)) != 0) {
+	error = locks_verify_locked(inode);
+	if (error) {
 		iput(inode);
 		return error;
 	}
@@ -443,7 +444,8 @@
 		 * here. Only O_TRUNC calls can modify the file contents -
 		 * but none of the commercial OS'es seem to do it this way.
 		 */
-		if ((error = locks_verify_locked(inode)) != 0) {
+		error = locks_verify_locked(inode);
+		if (error) {
 			iput(inode);
 			return error;
 		}