patch-2.4.0-test6 linux/fs/fcntl.c

Next file: linux/fs/inode.c
Previous file: linux/fs/fat/dir.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test5/linux/fs/fcntl.c linux/fs/fcntl.c
@@ -132,7 +132,7 @@
 	struct file * file;
 	struct files_struct * files = current->files;
 
-	write_lock(&current->files->file_lock);
+	write_lock(&files->file_lock);
 	if (!(file = fcheck(oldfd)))
 		goto out_unlock;
 	err = newfd;
@@ -158,7 +158,7 @@
 	FD_SET(newfd, files->open_fds);
 	write_unlock(&files->file_lock);
 	
-	do_close(newfd, 0);
+	do_close(files, newfd, 0);
 
 	write_lock(&files->file_lock);
 	allocate_fd(files, file, newfd);
@@ -167,7 +167,7 @@
 out:
 	return err;
 out_unlock:
-	write_unlock(&current->files->file_lock);
+	write_unlock(&files->file_lock);
 	goto out;
 }
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)