From: Richard Russon <ntfs@flatcap.org>
To: Alan Cox <alan@redhat.com>
Cc: lkml <linux-kernel@vger.kernel.org>
Subject: NTFS bugfix against 2.4.22-rc2-ac3
Date: 19 Aug 2003 23:48:04 +0100 [thread overview]
Message-ID: <1061333284.24761.5.camel@ipa.flatcap.org> (raw)
Hi Alan,
This patch fixes some debug-only macros which have the wrong number of parameters.
It is in addition to djgera's recent bugfix (to fix compilation warnings).
His patch didn't create any new bugs, but it did transmute a few existing ones.
Cheers,
FlatCap / Richard Russon
ntfs@flatcap.org
diff -urN linux-2.4.22-rc2-ac3/fs/ntfs/dir.c linux-2.4.22-rc2-ac3-ntfs/fs/ntfs/dir.c
--- linux-2.4.22-rc2-ac3/fs/ntfs/dir.c 2003-08-19 13:52:13.000000000 +0100
+++ linux-2.4.22-rc2-ac3-ntfs/fs/ntfs/dir.c 2003-08-19 13:52:48.000000000 +0100
@@ -881,8 +881,8 @@
/* filldir signalled us to stop. */
ntfs_debug(DEBUG_DIR3, "%s(): Unsorted 6: cb returned "
"%i, returning 0, p_high 0x%x, "
- "p_low 0x%x.\n", __FUNCTION__, *p_high,
- *p_low);
+ "p_low 0x%x.\n", __FUNCTION__, err,
+ *p_high, *p_low);
ntfs_free(buf);
return 0;
}
diff -urN linux-2.4.22-rc2-ac3/fs/ntfs/inode.c linux-2.4.22-rc2-ac3-ntfs/fs/ntfs/inode.c
--- linux-2.4.22-rc2-ac3/fs/ntfs/inode.c 2003-08-19 13:52:13.000000000 +0100
+++ linux-2.4.22-rc2-ac3-ntfs/fs/ntfs/inode.c 2003-08-19 13:52:48.000000000 +0100
@@ -1407,7 +1407,7 @@
}
/* Reuse rl_size as the current position index into rl. */
rl_size = *r1len - 1;
- ntfs_debug(DEBUG_OTHER, "%s(): rl_size = %i.\n", __FUNCTION__);
+ ntfs_debug(DEBUG_OTHER, "%s(): rl_size = %i.\n", __FUNCTION__,rl_size);
/* Coalesce neighbouring elements, if present. */
rl2_pos = 0;
if (rl[rl_size].lcn + rl[rl_size].len == rl2[rl2_pos].lcn) {
diff -urN linux-2.4.22-rc2-ac3/fs/ntfs/super.c linux-2.4.22-rc2-ac3-ntfs/fs/ntfs/super.c
--- linux-2.4.22-rc2-ac3/fs/ntfs/super.c 2003-08-19 13:52:13.000000000 +0100
+++ linux-2.4.22-rc2-ac3-ntfs/fs/ntfs/super.c 2003-08-19 13:52:48.000000000 +0100
@@ -1013,7 +1013,8 @@
ntfs_debug(DEBUG_OTHER, "%s(): Continuing "
"outer while loop, pass = 2, "
"zone_start = 0x%x, zone_end = 0x%x, "
- "buf_pos = 0x%x.\n", __FUNCTION__);
+ "buf_pos = 0x%x.\n", __FUNCTION__,
+ zone_start, zone_end, buf_pos);
continue;
} /* pass == 2 */
done_zones_check:
@@ -1212,9 +1213,8 @@
"= 0x%x, continuing outer while loop.\n",
__FUNCTION__, mft_zone_size,
vol->mft_zone_start, vol->mft_zone_end,
- vol->mft_zone_pos, search_zone, pass,
- done_zones, zone_start, zone_end,
- vol->data1_zone_pos);
+ vol->mft_zone_pos, done_zones, zone_start,
+ zone_end, vol->data1_zone_pos);
}
ntfs_debug(DEBUG_OTHER, "%s(): After outer while loop.\n",
__FUNCTION__);
reply other threads:[~2003-08-19 22:48 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1061333284.24761.5.camel@ipa.flatcap.org \
--to=ntfs@flatcap.org \
--cc=alan@redhat.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox