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

• Lines: 28
• Date: Sun Oct 13 21:11:16 1996
• Orig file: v2.1.3/linux/fs/fat/file.c
• Orig date: Sat Sep 28 23:39:17 1996

diff -u --recursive --new-file v2.1.3/linux/fs/fat/file.c linux/fs/fat/file.c
@@ -238,7 +238,7 @@
 		size = MIN(SECTOR_SIZE-offset,left_in_file);
 		if (MSDOS_I(inode)->i_binary) {
 			size = MIN(size,end-buf);
-			memcpy_tofs(buf,data,size);
+			copy_to_user(buf,data,size);
 			buf += size;
 			filp->f_pos += size;
 		}else{
@@ -329,7 +329,7 @@
 			break;
 		}
 		if (binary_mode) {
-			memcpy_fromfs(bh->b_data+offset,buf,written = size);
+			copy_from_user(bh->b_data+offset,buf,written = size);
 			buf += size;
 		} else {
 			written = left = SECTOR_SIZE-offset;
@@ -340,7 +340,8 @@
 				carry = 0;
 			}
 			for (size = 0; size < count && left; size++) {
-				if ((ch = get_user(buf++)) == '\n') {
+				get_user(ch, buf++);
+				if (ch == '\n') {
 					*to++ = '\r';
 					left--;
 				}