patch-2.4.0-test10 linux/fs/minix/namei.c

• Lines: 46
• Date: Sun Oct 8 10:52:08 2000
• Orig file: v2.4.0-test9/linux/fs/minix/namei.c
• Orig date: Sun Oct 8 10:50:32 2000

diff -u --recursive --new-file v2.4.0-test9/linux/fs/minix/namei.c linux/fs/minix/namei.c
@@ -210,10 +210,8 @@
 	struct minix_dir_entry * de;
 
 	inode = minix_new_inode(dir, &error);
-	if (error)
-		return error;
 	if (!inode)
-		return -ENOSPC;
+		return error;
 	inode->i_op = &minix_file_inode_operations;
 	inode->i_fop = &minix_file_operations;
 	inode->i_mapping->a_ops = &minix_aops;
@@ -242,10 +240,8 @@
 	struct minix_dir_entry * de;
 
 	inode = minix_new_inode(dir, &error);
-	if (error)
-		return error;
 	if (!inode)
-		return -ENOSPC;
+		return error;
 	inode->i_uid = current->fsuid;
 	init_special_inode(inode, mode, rdev);
 	mark_inode_dirty(inode);
@@ -275,10 +271,8 @@
 	if (dir->i_nlink >= info->s_link_max)
 		return -EMLINK;
 	inode = minix_new_inode(dir, &error);
-	if (error)
-		return error;
 	if (!inode)
-		return -ENOSPC;
+		return error;
 	inode->i_op = &minix_dir_inode_operations;
 	inode->i_fop = &minix_dir_operations;
 	inode->i_size = 2 * info->s_dirsize;
@@ -461,9 +455,6 @@
 	if (i>1024)
 		goto out;
 	inode = minix_new_inode(dir, &err);
-	if (err)
-		goto out;
-	err = -ENOSPC;
 	if (!inode)
 		goto out;