patch-2.1.4 linux/fs/sysv/file.c

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

diff -u --recursive --new-file v2.1.3/linux/fs/sysv/file.c linux/fs/sysv/file.c
@@ -171,7 +171,7 @@
 			left -= chars;
 			read += chars;
 			if (*bhe) {
-				memcpy_tofs(buf,offset+(*bhe)->b_data,chars);
+				copy_to_user(buf,offset+(*bhe)->b_data,chars);
 				brelse(*bhe);
 				buf += chars;
 			} else {
@@ -251,7 +251,7 @@
 		}
 		/* now either c==sb->sv_block_size or buffer_uptodate(bh) */
 		p = (pos & sb->sv_block_size_1) + bh->b_data;
-		memcpy_fromfs(p, buf, c);
+		copy_from_user(p, buf, c);
 		update_vm_cache(inode, pos, p, c);
 		pos += c;
 		if (pos > inode->i_size) {

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