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

Next file: linux/fs/xiafs/inode.c
Previous file: linux/fs/umsdos/ioctl.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.3/linux/fs/xiafs/file.c linux/fs/xiafs/file.c
@@ -160,7 +160,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 {
@@ -235,7 +235,7 @@
 	    }
 	}
 	cp = (pos & (XIAFS_ZSIZE(inode->i_sb)-1)) + bh->b_data;
-	memcpy_fromfs(cp,buf,c);
+	copy_from_user(cp,buf,c);
 	update_vm_cache(inode,pos,cp,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