Changes by: flatcap
Update of /cvsroot/linux-ntfs/ntfs-driver-tng/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv19988/scripts
Modified Files:
rl.c
Log Message:
123 and 132, OK
Index: rl.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/scripts/rl.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -U2 -r1.16 -r1.17
--- rl.c 12 Feb 2002 16:12:55 -0000 1.16
+++ rl.c 12 Feb 2002 17:27:39 -0000 1.17
@@ -12,5 +12,5 @@
#endif
#ifndef TEST
-#define TEST 1
+#define TEST 0
#endif
@@ -134,4 +134,5 @@
BUG_ON (!orig || !new);
+ //ntfs_debug ("ntfs_rl_append\n");
right = ntfs_rl_merge (new + nsize - 1, orig + loc + 1);
@@ -180,4 +181,5 @@
BUG_ON (!orig || !new);
+ //ntfs_debug ("ntfs_rl_insert\n");
if (loc > 0) {
left = ntfs_rl_merge (orig + loc - 1, new);
@@ -200,5 +202,5 @@
if ((res[loc+nsize-left+disc-hole].lcn == LCN_HOLE) ||
- (res[loc+nsize-left+disc-hole].lcn == LCN_RL_NOT_MAPPED)) {
+ (res[loc+nsize-left+disc-hole].lcn == LCN_RL_NOT_MAPPED)) {
res[loc+nsize-left+disc-hole].length -= (new[nsize-1].vcn +
new[nsize-1].length - new[0].vcn);
@@ -261,4 +263,5 @@
BUG_ON (!orig || !new);
+ //ntfs_debug ("ntfs_rl_replace\n");
right = ntfs_rl_merge (new + nsize - 1, orig + loc + 1);
if (loc > 0)
@@ -309,4 +312,5 @@
BUG_ON (!orig || !new);
+ //ntfs_debug ("ntfs_rl_split\n");
res = ntfs_rl_realloc (orig, osize, osize + nsize + 1);
if (IS_ERR (res))
@@ -362,8 +366,10 @@
lcn >= LCN_HOLE. */
+#if 1
ntfs_debug ("dst:\n");
ntfs_debug_dump_runlist (drl);
ntfs_debug ("src:\n");
ntfs_debug_dump_runlist (srl);
+#endif
/* Check for silly calling... */
@@ -459,5 +465,5 @@
int ss = sfinal - sstart + 1;
- start = ((drl[dins].lcn < LCN_HOLE) || /* End of file */
+ start = ((drl[dins].lcn < LCN_RL_NOT_MAPPED) || /* End of file */
(drl[dins].vcn == srl[sstart].vcn)); /* Start of hole */
finish = ((drl[dins].lcn >= LCN_RL_NOT_MAPPED) && /* End of file */
@@ -465,8 +471,10 @@
(srl[send-1].vcn + srl[send-1].length)));
- //ntfs_debug("dstart = %i, dfinal = %i, dend = %i\n", dstart, dfinal, dend);
- //ntfs_debug("sstart = %i, sfinal = %i, send = %i\n", sstart, sfinal, send);
- //ntfs_debug("start = %i, finish = %i\n", start, finish);
- //ntfs_debug("ds = %i, ss = %i, dins = %i\n", ds, ss, dins);
+#if 0
+ ntfs_debug("dstart = %i, dfinal = %i, dend = %i\n", dstart, dfinal, dend);
+ ntfs_debug("sstart = %i, sfinal = %i, send = %i\n", sstart, sfinal, send);
+ ntfs_debug("start = %i, finish = %i\n", start, finish);
+ ntfs_debug("ds = %i, ss = %i, dins = %i\n", ds, ss, dins);
+#endif
if (start)
if (finish)
@@ -489,6 +497,8 @@
/*ntfs_debug ("Merged run list:\n");*/
+#if 1
ntfs_debug ("res:\n");
ntfs_debug_dump_runlist (nrl);
+#endif
} else {
ntfs_error (NULL, "Merge failed, returning error code %ld.",
@@ -968,5 +978,5 @@
#endif
-#if 1 || defined (TESTF)
+#if 0 || defined (TESTF)
/**
* fragged
@@ -1007,5 +1017,5 @@
// CASE 123 - WORKS FINE.
-#if 1 || (TEST == 1)
+#if 0 || (TEST == 1)
rl1 = decompress_mapping_pairs (&vol, buf1, NULL);
if (IS_ERR (rl1))
|
