Changes by: flatcap
Update of /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv23238/linux/fs/ntfs
Modified Files:
attrib.c
Log Message:
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.64
retrieving revision 1.65
diff -U2 -r1.64 -r1.65
--- attrib.c 13 Feb 2002 22:00:42 -0000 1.64
+++ attrib.c 18 Feb 2002 01:53:00 -0000 1.65
@@ -66,8 +66,8 @@
run_list *nrl;
- if (old == new)
- return orig;
old = PAGE_ALIGN (old * sizeof (run_list));
new = PAGE_ALIGN (new * sizeof (run_list));
+ if (old == new)
+ return orig;
nrl = ntfs_malloc_nofs (new);
@@ -189,6 +189,4 @@
}
- //ntfs_debug("left = %i, disc = %i, hole = %i", left, disc, hole);
-
res = ntfs_rl_realloc (orig, osize, osize + nsize - left + disc - hole);
if (IS_ERR (res))
@@ -264,6 +262,4 @@
left = ntfs_rl_merge (orig + loc - 1, new);
- //printf("loc = %i, right = %i, left = %i\n", loc, right, left);
-
res = ntfs_rl_realloc (orig, osize, osize + nsize - left - right);
if (IS_ERR (res))
@@ -878,4 +874,5 @@
return (LCN)LCN_ENOENT;
}
+
/**
|
