[Linux-NTFS-cvs] CVS: ntfs-driver-tng/linux/fs/ntfs attrib.c,1.68,1.69

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv3020/linux/fs/ntfs

Modified Files:
	attrib.c 
Log Message:
fix a few size problems in attrib.c, resync attrib.c and rl.c


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/attrib.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -U2 -r1.68 -r1.69
--- attrib.c	4 Mar 2002 22:56:14 -0000	1.68
+++ attrib.c	5 Mar 2002 02:35:02 -0000	1.69
@@ -33,5 +33,5 @@
 {
 	if ((dst != src) && (size > 0))
-		memmove (base + dst, base + src, size * sizeof (run_list));
+		memmove (base + dst, base + src, size * sizeof (*base));
 }
 
@@ -46,5 +46,5 @@
 {
 	if (size > 0)
-		memcpy (dstbase+dst, srcbase+src, size * sizeof (run_list));
+		memcpy (dstbase+dst, srcbase+src, size * sizeof (*dstbase));
 }
 
@@ -74,6 +74,6 @@
 	run_list_element *nrl;
 
-	old = PAGE_ALIGN (old * sizeof (run_list));
-	new = PAGE_ALIGN (new * sizeof (run_list));
+	old = PAGE_ALIGN (old * sizeof (*orig));
+	new = PAGE_ALIGN (new * sizeof (*orig));
 	if (old == new)
 		return orig;
@@ -622,5 +622,5 @@
 		 * operates on whole pages only.
 		 */
-		if (((rlpos + 3) * sizeof(run_list)) > rlsize) {
+		if (((rlpos + 3) * sizeof(*old_rl)) > rlsize) {
 			rl2 = ntfs_malloc_nofs(rlsize + (int)PAGE_SIZE);
 			if (unlikely(!rl2)) {
@@ -923,5 +923,4 @@
 	return (LCN)LCN_ENOENT;
 }
-
 
 /**