patch-2.1.60 linux/fs/nfsd/vfs.c

Next file: linux/fs/nls/Config.in
Previous file: linux/fs/nfs/write.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.59/linux/fs/nfsd/vfs.c linux/fs/nfsd/vfs.c
@@ -364,7 +364,7 @@
 	file.f_pos = offset;
 
 	oldfs = get_fs(); set_fs(KERNEL_DS);
-	err = file.f_op->read(inode, &file, buf, *count);
+	err = file.f_op->read(&file, buf, *count, &file.f_pos);
 	set_fs(oldfs);
 
 	/* Write back readahead params */
@@ -432,7 +432,7 @@
 
 	/* Write the data. */
 	oldfs = get_fs(); set_fs(KERNEL_DS);
-	err = file.f_op->write(inode, &file, buf, cnt);
+	err = file.f_op->write(&file, buf, cnt, &file.f_pos);
 	set_fs(oldfs);
 
 	/* clear setuid/setgid flag after write */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov