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

Next file: linux/fs/affs/inode.c
Previous file: linux/fs/Config.in
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.3/linux/fs/affs/file.c linux/fs/affs/file.c
@@ -449,7 +449,7 @@
 		data = bh->b_data + 24;
 		size = MIN(blocksize - offset,left);
 		filp->f_pos += size;
-		memcpy_tofs(buf,data + offset,size);
+		copy_to_user(buf,data + offset,size);
 		buf += size;
 		affs_brelse(bh);
 	}
@@ -519,7 +519,7 @@
 			}
 		}
 		p = (pos % blocksize) + bh->b_data;
-		memcpy_fromfs(p,buf,c);
+		copy_from_user(p,buf,c);
 		update_vm_cache(inode,pos,p,c);
 		mark_buffer_uptodate(bh,1);
 		mark_buffer_dirty(bh,0);
@@ -600,7 +600,7 @@
 			}
 		}
 		p = (pos % blocksize) + bh->b_data + 24;
-		memcpy_fromfs(p,buf,c);
+		copy_from_user(p,buf,c);
 		update_vm_cache(inode,pos,p,c);
 
 		pos     += c;

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