patch-2.1.4 linux/fs/proc/scsi.c

Next file: linux/fs/read_write.c
Previous file: linux/fs/proc/root.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.3/linux/fs/proc/scsi.c linux/fs/proc/scsi.c
@@ -139,7 +139,7 @@
 	/*
 	 *  Copy the bytes
 	 */
-	memcpy_tofs(buf + copied, start, length);
+	copy_to_user(buf + copied, start, length);
 	file->f_pos += length;	/* Move down the file */
 	bytes -= length;
 	copied += length;
@@ -167,7 +167,7 @@
     if(dispatch_scsi_info_ptr != NULL) {
         if (!(page = (char *) __get_free_page(GFP_KERNEL)))
             return(-ENOMEM);
-	memcpy_fromfs(page, buf, count);
+	copy_from_user(page, buf, count);
 	ret = dispatch_scsi_info_ptr(inode->i_ino, page, 0, 0, count, 1);
     } else 
 	return(-ENOPKG);	  /* Nothing here */

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