|
From: Anton A. <an...@us...> - 2002-02-13 22:00:47
|
Changes by: antona
Update of /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs
In directory usw-pr-cvs1:/tmp/cvs-serv15785/linux/fs/ntfs
Modified Files:
aops.c attrib.c compress.c dir.c inode.c mft.c namei.c super.c
Log Message:
Fix new line character at end of debug strings.
Index: aops.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/aops.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -U2 -r1.51 -r1.52
--- aops.c 10 Feb 2002 02:22:58 -0000 1.51
+++ aops.c 13 Feb 2002 22:00:42 -0000 1.52
@@ -66,5 +66,5 @@
BOOL is_retry = FALSE;
- //ntfs_debug("Entering for blk 0x%lx.\n", blk);
+ //ntfs_debug("Entering for blk 0x%lx.", blk);
//printk(KERN_DEBUG "NTFS: " __FUNCTION__ "(): Entering for blk "
// "0x%lx.\n", blk);
@@ -169,5 +169,5 @@
MFT_RECORD *mrec;
- //ntfs_debug("Entering for index 0x%lx.\n", page->index);
+ //ntfs_debug("Entering for index 0x%lx.", page->index);
/* The page must be locked. */
if (!PageLocked(page))
@@ -281,5 +281,5 @@
LCN lcn;
- ntfs_debug("Entering for blk = 0x%lx, vcn = 0x%Lx, ofs = 0x%x.\n",
+ ntfs_debug("Entering for blk = 0x%lx, vcn = 0x%Lx, ofs = 0x%x.",
blk, (long long)vcn, ofs);
bh->b_dev = vol->mft_ino->i_dev;
@@ -287,5 +287,5 @@
bh->b_blocknr = -1;
lcn = vcn_to_lcn(vol->mftbmp_rl, vcn);
- ntfs_debug("lcn = 0x%Lx.\n", (long long)lcn);
+ ntfs_debug("lcn = 0x%Lx.", (long long)lcn);
if (lcn < 0LL) {
ntfs_error(vol->sb, "Returning -EIO, lcn = 0x%Lx.",
@@ -297,5 +297,5 @@
vol->sb->s_blocksize_bits;
bh->b_state |= (1UL << BH_Mapped);
- ntfs_debug("Done, bh->b_blocknr = 0x%lx.\n", bh->b_blocknr);
+ ntfs_debug("Done, bh->b_blocknr = 0x%lx.", bh->b_blocknr);
return 0;
}
@@ -315,5 +315,5 @@
unsigned char blocksize_bits;
- ntfs_debug("Entering for index 0x%lx.\n", page->index);
+ ntfs_debug("Entering for index 0x%lx.", page->index);
if (!PageLocked(page))
PAGE_BUG(page);
@@ -332,13 +332,13 @@
lblock = (((vol->nr_mft_records + 7) >> 3) + blocksize - 1) >>
blocksize_bits;
- ntfs_debug("blocks = 0x%x, iblock = 0x%lx, lblock = 0x%lx.\n", blocks,
+ ntfs_debug("blocks = 0x%x, iblock = 0x%lx, lblock = 0x%lx.", blocks,
iblock, lblock);
bh = head;
nr = i = 0;
do {
- ntfs_debug("In do loop, i = 0x%x, iblock = 0x%lx.\n", i,
+ ntfs_debug("In do loop, i = 0x%x, iblock = 0x%lx.", i,
iblock);
if (buffer_uptodate(bh)) {
- ntfs_debug("Buffer is already uptodate.\n");
+ ntfs_debug("Buffer is already uptodate.");
continue;
}
@@ -350,5 +350,5 @@
if (!buffer_mapped(bh)) {
ntfs_debug("Buffer is not mapped, setting "
- "uptodate.\n");
+ "uptodate.");
memset(kmap(page) + i*blocksize, 0, blocksize);
flush_dcache_page(page);
@@ -362,5 +362,5 @@
*/
if (buffer_uptodate(bh)) {
- ntfs_debug("Buffer is now uptodate.\n");
+ ntfs_debug("Buffer is now uptodate.");
continue;
}
@@ -368,9 +368,9 @@
arr[nr++] = bh;
} while (i++, iblock++, (bh = bh->b_this_page) != head);
- ntfs_debug("After do loop, i = 0x%x, iblock = 0x%lx, nr = 0x%x.\n", i,
+ ntfs_debug("After do loop, i = 0x%x, iblock = 0x%lx, nr = 0x%x.", i,
iblock, nr);
if (!nr) {
/* All buffers are uptodate - set the page uptodate as well. */
- ntfs_debug("All buffers are uptodate, returning 0.\n");
+ ntfs_debug("All buffers are uptodate, returning 0.");
SetPageUptodate(page);
UnlockPage(page);
@@ -378,5 +378,5 @@
}
/* Stage two: lock the buffers */
- ntfs_debug("Locking buffers.\n");
+ ntfs_debug("Locking buffers.");
for (i = 0; i < nr; i++) {
struct buffer_head *bh = arr[i];
@@ -385,8 +385,8 @@
}
/* Stage 3: start the IO */
- ntfs_debug("Starting IO on buffers.\n");
+ ntfs_debug("Starting IO on buffers.");
for (i = 0; i < nr; i++)
submit_bh(READ, arr[i]);
- ntfs_debug("Done.\n");
+ ntfs_debug("Done.");
return 0;
}
@@ -594,5 +594,5 @@
if (!nr_bu) {
ntfs_debug("All buffers in the page were already uptodate, "
- "assuming mst fixups were already applied.\n");
+ "assuming mst fixups were already applied.");
SetPageUptodate(page);
UnlockPage(page);
Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/attrib.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -U2 -r1.63 -r1.64
--- attrib.c 13 Feb 2002 03:05:22 -0000 1.63
+++ attrib.c 13 Feb 2002 22:00:42 -0000 1.64
@@ -189,5 +189,5 @@
}
- //ntfs_debug("left = %i, disc = %i, hole = %i\n", left, disc, hole);
+ //ntfs_debug("left = %i, disc = %i, hole = %i", left, disc, hole);
res = ntfs_rl_realloc (orig, osize, osize + nsize - left + disc - hole);
@@ -363,7 +363,7 @@
#if 1
- ntfs_debug ("dst:\n");
+ ntfs_debug ("dst:");
ntfs_debug_dump_runlist (drl);
- ntfs_debug ("src:\n");
+ ntfs_debug ("src:");
ntfs_debug_dump_runlist (srl);
#endif
@@ -465,8 +465,8 @@
#if 0
- ntfs_debug("dfinal = %i, dend = %i\n", 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);
+ ntfs_debug("dfinal = %i, dend = %i", dfinal, dend);
+ ntfs_debug("sstart = %i, sfinal = %i, send = %i", sstart, sfinal, send);
+ ntfs_debug("start = %i, finish = %i", start, finish);
+ ntfs_debug("ds = %i, ss = %i, dins = %i", ds, ss, dins);
#endif
if (start)
@@ -492,9 +492,9 @@
if (nrl != srl)
ntfs_free (srl);
- /*ntfs_debug ("Done.\n");*/
- /*ntfs_debug ("Merged run list:\n");*/
+ /*ntfs_debug ("Done.");*/
+ /*ntfs_debug ("Merged run list:");*/
#if 1
- ntfs_debug ("res:\n");
+ ntfs_debug ("res:");
ntfs_debug_dump_runlist (nrl);
#endif
@@ -710,5 +710,5 @@
if (deltaxcn < --max_cluster) {
//RAR ntfs_debug("More extents to follow; deltaxcn = 0x%Lx, "
- //RAR "max_cluster = 0x%Lx\n",
+ //RAR "max_cluster = 0x%Lx",
//RAR (long long)deltaxcn,
//RAR (long long)max_cluster);
@@ -731,5 +731,5 @@
(rl + rlpos)->vcn = vcn;
(rl + rlpos)->length = (s64)0;
- //RAR ntfs_debug("Mapping pairs array successfully decompressed.\n");
+ //RAR ntfs_debug("Mapping pairs array successfully decompressed.");
//RAR ntfs_debug_dump_runlist(rl);
/* If no existing run list was specified, we are done. */
@@ -769,5 +769,5 @@
int err;
- ntfs_debug("Mapping run list part containing vcn 0x%Lx.\n",
+ ntfs_debug("Mapping run list part containing vcn 0x%Lx.",
(long long)vcn);
@@ -815,5 +815,5 @@
ni->run_list = rl;
- ntfs_debug("Done.\n");
+ ntfs_debug("Done.");
return 0;
@@ -1059,5 +1059,5 @@
unsigned char block_size_bits = sb->s_blocksize_bits;
- ntfs_debug("Entering.\n");
+ ntfs_debug("Entering.");
#ifdef DEBUG
if (!vol || !rl || !al || size <= 0)
@@ -1067,5 +1067,5 @@
while (rl->length) {
lcn = vcn_to_lcn(rl, rl->vcn);
- ntfs_debug("Reading vcn = 0x%Lx, lcn = 0x%Lx.\n",
+ ntfs_debug("Reading vcn = 0x%Lx, lcn = 0x%Lx.",
(long long)rl->vcn, (long long)lcn);
/* The attribute list cannot be sparse. */
@@ -1079,7 +1079,7 @@
max_block = block + (rl->length << vol->cluster_size_bits >>
block_size_bits);
- ntfs_debug("max_block = 0x%lx.\n", max_block);
+ ntfs_debug("max_block = 0x%lx.", max_block);
do {
- ntfs_debug("Reading block = 0x%lx.\n", block);
+ ntfs_debug("Reading block = 0x%lx.", block);
bh = sb_bread(sb, block);
if (!bh)
@@ -1171,5 +1171,5 @@
ni = ctx->ntfs_ino;
base_ni = ctx->base_ntfs_ino;
- ntfs_debug("Entering for inode 0x%Lx, type 0x%x.\n",
+ ntfs_debug("Entering for inode 0x%Lx, type 0x%x.",
(unsigned long long)ni->mft_no, type);
if (!base_ni) {
@@ -1357,5 +1357,5 @@
== val_len && !memcmp((u8*)a +
le16_to_cpu(a->value_offset), val, val_len))) {
- ntfs_debug("Done, found.\n");
+ ntfs_debug("Done, found.");
return TRUE;
}
@@ -1392,5 +1392,5 @@
reinit_attr_search_ctx(ctx);
find_attr(type, name, name_len, ic, val, val_len, ctx);
- ntfs_debug("Done, not found.\n");
+ ntfs_debug("Done, not found.");
return FALSE;
}
@@ -1430,5 +1430,5 @@
ntfs_inode *base_ni;
- ntfs_debug("Entering.\n");
+ ntfs_debug("Entering.");
if (ctx->base_ntfs_ino)
base_ni = ctx->base_ntfs_ino;
Index: compress.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/compress.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -U2 -r1.30 -r1.31
--- compress.c 8 Feb 2002 05:17:11 -0000 1.30
+++ compress.c 13 Feb 2002 22:00:42 -0000 1.31
@@ -173,7 +173,7 @@
int err = -EOVERFLOW;
- ntfs_debug("Entering, cb_size = 0x%x.\n", cb_size);
+ ntfs_debug("Entering, cb_size = 0x%x.", cb_size);
do_next_sb:
- ntfs_debug("Beginning sub-block at offset = 0x%x in the cb.\n",
+ ntfs_debug("Beginning sub-block at offset = 0x%x in the cb.",
cb - cb_start);
@@ -182,5 +182,5 @@
int i;
- ntfs_debug("Completed. Returning success (0).\n");
+ ntfs_debug("Completed. Returning success (0).");
err = 0;
return_error:
@@ -239,5 +239,5 @@
/* Now, we are ready to process the current sub-block (sb). */
if (!(le16_to_cpup(cb) & NTFS_SB_IS_COMPRESSED)) {
- ntfs_debug("Found uncompressed sub-block.\n");
+ ntfs_debug("Found uncompressed sub-block.");
/* This sb is not compressed, just copy it into destination. */
@@ -267,5 +267,5 @@
goto do_next_sb;
}
- ntfs_debug("Found compressed sub-block.\n");
+ ntfs_debug("Found compressed sub-block.");
/* This sb is compressed, decompress it into destination. */
@@ -283,5 +283,5 @@
ntfs_debug("Filling incomplete sub-block with "
- "zeroes.\n");
+ "zeroes.");
/* Zero remainder and update destination position. */
memset(dp_addr, 0, nr_bytes);
@@ -300,5 +300,5 @@
/* Get the next tag and advance to first token. */
tag = *cb++;
- //ntfs_debug("Found tag = 0x%x.\n", tag);
+ //ntfs_debug("Found tag = 0x%x.", tag);
/* Parse the eight tokens described by the tag. */
@@ -314,5 +314,5 @@
/* Determine token type and parse appropriately.*/
if ((tag & NTFS_TOKEN_MASK) == NTFS_SYMBOL_TOKEN) {
- //ntfs_debug("Found symbol token = %c (0x%x).\n", *cb,
+ //ntfs_debug("Found symbol token = %c (0x%x).", *cb,
// *cb);
/*
@@ -327,5 +327,5 @@
}
- //ntfs_debug("Found phrase token = 0x%x.\n", le16_to_cpup(cb));
+ //ntfs_debug("Found phrase token = 0x%x.", le16_to_cpup(cb));
/*
* We have a phrase token. Make sure it is not the first tag in
@@ -362,5 +362,5 @@
#if 0
ntfs_debug("starting position = 0x%x, back pointer = 0x%x, "
- "length = 0x%x.\n", *dest_ofs - do_sb_start -
+ "length = 0x%x.", *dest_ofs - do_sb_start -
1, (pt >> (12 - lg)) + 1, length);
#endif
@@ -374,5 +374,5 @@
if (length <= max_non_overlap) {
- //ntfs_debug("Found non-overlapping byte sequence.\n");
+ //ntfs_debug("Found non-overlapping byte sequence.");
/* The byte sequence doesn't overlap, just copy it. */
memcpy(dp_addr, dp_back_addr, length);
@@ -381,5 +381,5 @@
dp_addr += length;
} else {
- //ntfs_debug("Found overlapping byte sequence.\n");
+ //ntfs_debug("Found overlapping byte sequence.");
/*
* The byte sequence does overlap, copy non-overlapping
@@ -478,5 +478,5 @@
ntfs_debug("Entering, page->index = 0x%lx, cb_size = 0x%x, nr_pages = "
- "%i.\n", index, cb_size, nr_pages);
+ "%i.", index, cb_size, nr_pages);
/*
@@ -560,5 +560,5 @@
/* Find lcn of vcn and convert it into blocks. */
lcn = vcn_to_lcn(ni->run_list, vcn);
- ntfs_debug("Reading vcn = 0x%Lx, lcn = 0x%Lx.\n",
+ ntfs_debug("Reading vcn = 0x%Lx, lcn = 0x%Lx.",
(long long)vcn, (long long)lcn);
if (lcn < 0) {
@@ -581,5 +581,5 @@
max_block = block + (vol->cluster_size >> block_size_bits);
do {
- ntfs_debug("block = 0x%x.\n", block);
+ ntfs_debug("block = 0x%x.", block);
if (unlikely(!(bhs[nr_bhs] = getblk(dev, block,
block_size))))
@@ -642,5 +642,5 @@
/* We now have both source (if present) and destination. */
- ntfs_debug("Successfully read the compression block.\n");
+ ntfs_debug("Successfully read the compression block.");
/* The last page and maximum offset within it for the current cb. */
@@ -655,5 +655,5 @@
if (vcn == start_vcn - cb_clusters) {
/* Sparse cb, zero out page range overlapping the cb. */
- ntfs_debug("Found sparse compression block.\n");
+ ntfs_debug("Found sparse compression block.");
/* We can sleep from now on. */
if (cb_max_ofs)
@@ -703,5 +703,5 @@
u8 *cb_pos2 = cb_pos;
- ntfs_debug("Found uncompressed compression block.\n");
+ ntfs_debug("Found uncompressed compression block.");
/* Uncompressed cb, copy it to the destination pages. */
/*
@@ -760,5 +760,5 @@
unsigned int prev_cur_page = cur_page;
- ntfs_debug("Found compressed compression block.\n");
+ ntfs_debug("Found compressed compression block.");
err = ntfs_decompress(pages, &cur_page, &cur_ofs,
cb_max_page, cb_max_ofs, xpage, &xpage_done,
@@ -820,5 +820,5 @@
return 0;
- ntfs_debug("Failed. Returning error code %s.\n", err == -EOVERFLOW ?
+ ntfs_debug("Failed. Returning error code %s.", err == -EOVERFLOW ?
"EOVERFLOW" : (!err ? "EIO" : "unkown error"));
return err < 0 ? err : -EIO;
Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/dir.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -U2 -r1.43 -r1.44
--- dir.c 10 Feb 2002 04:31:06 -0000 1.43
+++ dir.c 13 Feb 2002 22:00:42 -0000 1.44
@@ -390,5 +390,5 @@
}
/* No child node, return -ENOENT. */
- ntfs_debug("Entry not found.\n");
+ ntfs_debug("Entry not found.");
err = -ENOENT;
unm_unm_err_out:
@@ -442,9 +442,9 @@
filp->f_pos = (u8*)ie - (u8*)iu.ir;
if (ie->key.file_name.file_name_type == FILE_NAME_DOS) {
- ntfs_debug("Skipping DOS only name space entry.\n");
+ ntfs_debug("Skipping DOS only name space entry.");
return 0;
}
if (MREF_LE(ie->indexed_file) == FILE_root) {
- ntfs_debug("Skipping root directory self reference entry.\n");
+ ntfs_debug("Skipping root directory self reference entry.");
return 0;
}
@@ -453,5 +453,5 @@
NTFS_MAX_NAME_LEN * 3 + 1);
if (name_len <= 0) {
- ntfs_debug("Skipping unrepresentable file.\n");
+ ntfs_debug("Skipping unrepresentable file.");
return 0;
}
@@ -462,5 +462,5 @@
dt_type = DT_REG;
ntfs_debug("Calling filldir for %s with len %i, f_pos 0x%Lx, inode "
- "0x%Lx, DT_%s.\n", name, name_len, filp->f_pos,
+ "0x%Lx, DT_%s.", name, name_len, filp->f_pos,
(unsigned long long)MREF_LE(ie->indexed_file),
dt_type == DT_DIR ? "DIR" : "REG");
@@ -495,5 +495,5 @@
attr_search_context *ctx;
- ntfs_debug("Entering for inode 0x%Lx, f_pos 0x%Lx.\n",
+ ntfs_debug("Entering for inode 0x%Lx, f_pos 0x%Lx.",
(unsigned long long)ndir->mft_no, filp->f_pos);
rc = err = 0;
@@ -504,5 +504,5 @@
if (!filp->f_pos) {
ntfs_debug("Calling filldir for . with len 1, f_pos 0x0, "
- "inode 0x%Lx, DT_DIR.\n",
+ "inode 0x%Lx, DT_DIR.",
(unsigned long long)ndir->mft_no);
rc = filldir(dirent, ".", 1, filp->f_pos, vdir->i_ino, DT_DIR);
@@ -513,5 +513,5 @@
if (filp->f_pos == 1) {
ntfs_debug("Calling filldir for .. with len 2, f_pos 0x1, "
- "inode 0x%Lx, DT_DIR.\n",
+ "inode 0x%Lx, DT_DIR.",
(unsigned long long)NTFS_I(
filp->f_dentry->d_parent->d_inode)->mft_no);
@@ -570,5 +570,5 @@
*/
for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->length))) {
- ntfs_debug("In index root, offset 0x%x.\n", (u8*)ie - (u8*)ir);
+ ntfs_debug("In index root, offset 0x%x.", (u8*)ie - (u8*)ir);
/* Bounds checks. */
if ((u8*)ie < (u8*)ctx->mrec || (u8*)ie +
@@ -640,5 +640,5 @@
ia_pos = (s64)bmp_pos << ndir->index_block_size_bits;
}
- ntfs_debug("Handling index buffer 0x%x.\n", bmp_pos);
+ ntfs_debug("Handling index buffer 0x%x.", bmp_pos);
/* If the current index buffer is in the same page we reuse the page. */
if ((prev_ia_pos & PAGE_CACHE_MASK) != (ia_pos & PAGE_CACHE_MASK)) {
@@ -722,5 +722,5 @@
*/
for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->length))) {
- ntfs_debug("In index allocation, offset 0x%Lx.\n",
+ ntfs_debug("In index allocation, offset 0x%Lx.",
(long long)ia_start + ((u8*)ie - (u8*)ia));
/* Bounds checks. */
@@ -755,7 +755,7 @@
#ifdef DEBUG
if (!rc)
- ntfs_debug("EOD, f_pos 0x%Lx, returning 0.\n", filp->f_pos);
+ ntfs_debug("EOD, f_pos 0x%Lx, returning 0.", filp->f_pos);
else
- ntfs_debug("filldir returned %i, f_pos 0x%Lx, returning 0.\n",
+ ntfs_debug("filldir returned %i, f_pos 0x%Lx, returning 0.",
rc, filp->f_pos);
#endif
@@ -771,5 +771,5 @@
unmap_mft_record(READ, ndir);
err_out:
- ntfs_debug("Failed. Returning error code %i.\n", -err);
+ ntfs_debug("Failed. Returning error code %i.", -err);
return err;
unm_dir_err_out:
Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/inode.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -U2 -r1.65 -r1.66
--- inode.c 10 Feb 2002 02:22:58 -0000 1.65
+++ inode.c 13 Feb 2002 22:00:42 -0000 1.66
@@ -28,5 +28,5 @@
ntfs_inode *ni;
- ntfs_debug("Entering.\n");
+ ntfs_debug("Entering.");
ni = (ntfs_inode *)kmem_cache_alloc(ntfs_big_inode_cache,
SLAB_NOFS);
@@ -43,5 +43,5 @@
ntfs_inode *ni = NTFS_I(inode);
- ntfs_debug("Entering.\n");
+ ntfs_debug("Entering.");
BUG_ON(atomic_read(&ni->mft_count) || !atomic_dec_and_test(&ni->count));
kmem_cache_free(ntfs_big_inode_cache, NTFS_I(inode));
@@ -52,5 +52,5 @@
ntfs_inode *ni = (ntfs_inode *)kmem_cache_alloc(ntfs_inode_cache,
SLAB_NOFS);
- ntfs_debug("Entering.\n");
+ ntfs_debug("Entering.");
if (unlikely(!ni))
ntfs_error(NULL, "Allocation of NTFS inode structure failed.");
@@ -60,5 +60,5 @@
void ntfs_destroy_inode(ntfs_inode *ni)
{
- ntfs_debug("Entering.\n");
+ ntfs_debug("Entering.");
BUG_ON(atomic_read(&ni->mft_count) || !atomic_dec_and_test(&ni->count));
kmem_cache_free(ntfs_inode_cache, ni);
@@ -74,5 +74,5 @@
static void __ntfs_init_inode(struct super_block *sb, ntfs_inode *ni)
{
- ntfs_debug("Entering.\n");
+ ntfs_debug("Entering.");
memset(ni, 0, sizeof(ntfs_inode));
atomic_set(&ni->count, 1);
@@ -95,5 +95,5 @@
ntfs_inode *ni = NTFS_I(vi);
- ntfs_debug("Entering.\n");
+ ntfs_debug("Entering.");
__ntfs_init_inode(vi->i_sb, ni);
ni->mft_no = vi->i_ino;
@@ -105,5 +105,5 @@
ntfs_inode *ni = ntfs_alloc_inode();
- ntfs_debug("Entering.\n");
+ ntfs_debug("Entering.");
if (ni)
__ntfs_init_inode(sb, ni);
@@ -219,5 +219,5 @@
int err;
- ntfs_debug("Entering for i_ino 0x%lx.\n", vi->i_ino);
+ ntfs_debug("Entering for i_ino 0x%lx.", vi->i_ino);
/* Setup the generic vfs inode parts now. */
@@ -348,5 +348,5 @@
if (vi->i_ino == FILE_MFT)
goto skip_attr_list_load;
- ntfs_debug("Attribute list found in inode %li (0x%lx).\n",
+ ntfs_debug("Attribute list found in inode %li (0x%lx).",
vi->i_ino, vi->i_ino);
ni->state |= 1 << NI_AttrList;
@@ -746,5 +746,5 @@
put_attr_search_ctx(ctx);
unmap_mft_record(READ, ni);
- ntfs_debug("Done.\n");
+ ntfs_debug("Done.");
return;
ec_put_unm_err_out:
@@ -804,5 +804,5 @@
int err;
- ntfs_debug("Entering.\n");
+ ntfs_debug("Entering.");
/* Initialize the ntfs specific part of @vi. */
@@ -881,5 +881,5 @@
u8 *al_end;
- ntfs_debug("Attribute list attribute found in $MFT.\n");
+ ntfs_debug("Attribute list attribute found in $MFT.");
ni->state |= 1 << NI_AttrList;
if (ctx->attr->flags & ATTR_IS_ENCRYPTED ||
@@ -1120,10 +1120,10 @@
"for $MFT/$DATA. Driver bug or "
"corrupt $MFT. Run chkdsk.");
- ntfs_debug("highest_vcn = 0x%Lx, last_vcn - 1 = 0x%Lx\n",
+ ntfs_debug("highest_vcn = 0x%Lx, last_vcn - 1 = 0x%Lx",
(long long)highest_vcn, (long long)last_vcn - 1);
goto put_err_out;
}
put_attr_search_ctx(ctx);
- ntfs_debug("Done.\n");
+ ntfs_debug("Done.");
out_now:
ntfs_free(m);
@@ -1170,5 +1170,5 @@
void ntfs_dirty_inode(struct inode *vi)
{
- ntfs_debug("Entering for inode 0x%lx.\n", vi->i_ino);
+ ntfs_debug("Entering for inode 0x%lx.", vi->i_ino);
NInoSetDirty(NTFS_I(vi));
return;
@@ -1182,5 +1182,5 @@
int ntfs_commit_inode(ntfs_inode *ni)
{
- ntfs_debug("Entering for inode 0x%Lx.\n",
+ ntfs_debug("Entering for inode 0x%Lx.",
(unsigned long long)ni->mft_no);
NInoClearDirty(ni);
@@ -1192,5 +1192,5 @@
int err;
- ntfs_debug("Entering for inode 0x%Lx.\n",
+ ntfs_debug("Entering for inode 0x%Lx.",
(unsigned long long)ni->mft_no);
if (NInoDirty(ni)) {
Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/mft.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -U2 -r1.47 -r1.48
--- mft.c 8 Feb 2002 05:17:11 -0000 1.47
+++ mft.c 13 Feb 2002 22:00:42 -0000 1.48
@@ -418,5 +418,5 @@
MFT_RECORD *m;
- ntfs_debug("Entering for i_ino 0x%Lx, mapping for %s.\n",
+ ntfs_debug("Entering for i_ino 0x%Lx, mapping for %s.",
(unsigned long long)ni->mft_no,
rw == READ ? "READ" : "WRITE");
@@ -508,5 +508,5 @@
mrec = map_mft_record(rw, inode);
if (!IS_ERR(mrec)) {
- ntfs_debug("Success for i_ino 0x%lx.\n", inum);
+ ntfs_debug("Success for i_ino 0x%lx.", inum);
*vfs_ino = inode;
return mrec;
@@ -516,5 +516,5 @@
if (inode)
iput(inode);
- ntfs_debug("Failed for i_ino 0x%lx.\n", inum);
+ ntfs_debug("Failed for i_ino 0x%lx.", inum);
return mrec;
}
@@ -547,5 +547,5 @@
BUG_ON(!atomic_read(&ni->mft_count) || !page);
- ntfs_debug("Entering for mft_no 0x%Lx, unmapping from %s.\n",
+ ntfs_debug("Entering for mft_no 0x%Lx, unmapping from %s.",
(unsigned long long)ni->mft_no,
rw == READ ? "READ" : "WRITE");
@@ -602,5 +602,5 @@
BOOL destroy_ni = FALSE;
- ntfs_debug("Mapping extent mft record 0x%Lx (base mft record 0x%Lx).\n",
+ ntfs_debug("Mapping extent mft record 0x%Lx (base mft record 0x%Lx).",
(unsigned long long)mft_no,
(unsigned long long)base_ni->mft_no);
@@ -634,5 +634,5 @@
/* Verify the sequence number. */
if (le16_to_cpu(m->sequence_number) == seq_no) {
- ntfs_debug("Done 1.\n");
+ ntfs_debug("Done 1.");
*ntfs_ino = ni;
return m;
Index: namei.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/namei.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -U2 -r1.20 -r1.21
--- namei.c 8 Feb 2002 02:53:55 -0000 1.20
+++ namei.c 13 Feb 2002 22:00:42 -0000 1.21
@@ -54,5 +54,5 @@
int uname_len;
- ntfs_debug("Looking up %s in directory inode 0x%lx.\n",
+ ntfs_debug("Looking up %s in directory inode 0x%lx.",
dent->d_name.name, dir_ino->i_ino);
/* Convert the name of the dentry to Unicode. */
@@ -67,5 +67,5 @@
if (!IS_ERR_MREF(mref)) {
dent_ino = (unsigned long)MREF(mref);
- ntfs_debug("Found inode 0x%lx. Calling iget.\n", dent_ino);
+ ntfs_debug("Found inode 0x%lx. Calling iget.", dent_ino);
dent_inode = iget(vol->sb, dent_ino);
if (dent_inode) {
@@ -74,5 +74,5 @@
dent_ino == FILE_MFT) {
d_add(dent, dent_inode);
- ntfs_debug("Done.\n");
+ ntfs_debug("Done.");
return NULL;
}
@@ -92,8 +92,8 @@
}
if (MREF_ERR(mref) == -ENOENT) {
- ntfs_debug("Entry was not found, adding negative dentry.\n");
+ ntfs_debug("Entry was not found, adding negative dentry.");
/* The dcache will handle negative entries. */
d_add(dent, NULL);
- ntfs_debug("Done.\n");
+ ntfs_debug("Done.");
return NULL;
}
Index: super.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfs-driver-tng/linux/fs/ntfs/super.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -U2 -r1.73 -r1.74
--- super.c 10 Feb 2002 02:22:58 -0000 1.73
+++ super.c 13 Feb 2002 22:00:42 -0000 1.74
@@ -169,5 +169,5 @@
return FALSE;
} /* else (!vol->nls_map) */
- ntfs_debug("Using NLS character set %s.\n", nls_map->charset);
+ ntfs_debug("Using NLS character set %s.", nls_map->charset);
vol->nls_map = nls_map;
} else /* (!nls_map) */ {
@@ -179,5 +179,5 @@
return FALSE;
}
- ntfs_debug("Using default NLS character set (%s).\n",
+ ntfs_debug("Using default NLS character set (%s).",
vol->nls_map->charset);
}
@@ -236,5 +236,5 @@
ntfs_volume *vol = NTFS_SB(sb);
- ntfs_debug("Entering.\n");
+ ntfs_debug("Entering.");
// FIXME/TODO: If left like this we will have problems with rw->ro and
@@ -475,24 +475,24 @@
vol->sector_size = le16_to_cpu(b->bpb.bytes_per_sector);
vol->sector_size_bits = ffs(vol->sector_size) - 1;
- ntfs_debug("vol->sector_size = %i (0x%x)\n", vol->sector_size,
+ ntfs_debug("vol->sector_size = %i (0x%x)", vol->sector_size,
vol->sector_size);
- ntfs_debug("vol->sector_size_bits = %i (0x%x)\n", vol->sector_size_bits,
+ ntfs_debug("vol->sector_size_bits = %i (0x%x)", vol->sector_size_bits,
vol->sector_size_bits);
if (vol->sector_size != vol->sb->s_blocksize)
ntfs_warning(vol->sb, "The boot sector indicates a sector size "
"different from the device sector size.");
- ntfs_debug("sectors_per_cluster = 0x%x\n", b->bpb.sectors_per_cluster);
+ ntfs_debug("sectors_per_cluster = 0x%x", b->bpb.sectors_per_cluster);
sectors_per_cluster_bits = ffs(b->bpb.sectors_per_cluster) - 1;
- ntfs_debug("sectors_per_cluster_bits = 0x%x\n",
+ ntfs_debug("sectors_per_cluster_bits = 0x%x",
sectors_per_cluster_bits);
nr_hidden_sects = le32_to_cpu(b->bpb.hidden_sectors);
- ntfs_debug("number of hidden sectors = 0x%x\n", nr_hidden_sects);
+ ntfs_debug("number of hidden sectors = 0x%x", nr_hidden_sects);
vol->cluster_size = vol->sector_size << sectors_per_cluster_bits;
vol->cluster_size_mask = vol->cluster_size - 1;
vol->cluster_size_bits = ffs(vol->cluster_size) - 1;
- ntfs_debug("vol->cluster_size = %i (0x%x)\n", vol->cluster_size,
+ ntfs_debug("vol->cluster_size = %i (0x%x)", vol->cluster_size,
vol->cluster_size);
- ntfs_debug("vol->cluster_size_mask = 0x%x\n", vol->cluster_size_mask);
- ntfs_debug("vol->cluster_size_bits = %i (0x%x)\n",
+ ntfs_debug("vol->cluster_size_mask = 0x%x", vol->cluster_size_mask);
+ ntfs_debug("vol->cluster_size_bits = %i (0x%x)",
vol->cluster_size_bits, vol->cluster_size_bits);
if (vol->sector_size > vol->cluster_size) {
@@ -507,5 +507,5 @@
}
clusters_per_mft_record = b->clusters_per_mft_record;
- ntfs_debug("clusters_per_mft_record = %i (0x%x)\n",
+ ntfs_debug("clusters_per_mft_record = %i (0x%x)",
clusters_per_mft_record, clusters_per_mft_record);
if (clusters_per_mft_record > 0)
@@ -521,12 +521,12 @@
vol->mft_record_size_mask = vol->mft_record_size - 1;
vol->mft_record_size_bits = ffs(vol->mft_record_size) - 1;
- ntfs_debug("vol->mft_record_size = %i (0x%x)\n", vol->mft_record_size,
+ ntfs_debug("vol->mft_record_size = %i (0x%x)", vol->mft_record_size,
vol->mft_record_size);
- ntfs_debug("vol->mft_record_size_mask = 0x%x\n",
+ ntfs_debug("vol->mft_record_size_mask = 0x%x",
vol->mft_record_size_mask);
- ntfs_debug("vol->mft_record_size_bits = %i (0x%x)\n",
+ ntfs_debug("vol->mft_record_size_bits = %i (0x%x)",
vol->mft_record_size_bits, vol->mft_record_size_bits);
clusters_per_index_record = b->clusters_per_index_record;
- ntfs_debug("clusters_per_index_record = %i (0x%x)\n",
+ ntfs_debug("clusters_per_index_record = %i (0x%x)",
clusters_per_index_record, clusters_per_index_record);
if (clusters_per_index_record > 0)
@@ -543,9 +543,9 @@
vol->index_record_size_mask = vol->index_record_size - 1;
vol->index_record_size_bits = ffs(vol->index_record_size) - 1;
- ntfs_debug("vol->index_record_size = %i (0x%x)\n",
+ ntfs_debug("vol->index_record_size = %i (0x%x)",
vol->index_record_size, vol->index_record_size);
- ntfs_debug("vol->index_record_size_mask = 0x%x\n",
+ ntfs_debug("vol->index_record_size_mask = 0x%x",
vol->index_record_size_mask);
- ntfs_debug("vol->index_record_size_bits = %i (0x%x)\n",
+ ntfs_debug("vol->index_record_size_bits = %i (0x%x)",
vol->index_record_size_bits,
vol->index_record_size_bits);
@@ -562,5 +562,5 @@
}
vol->nr_clusters = ll;
- ntfs_debug("vol->nr_clusters = 0x%Lx\n", (long long)vol->nr_clusters);
+ ntfs_debug("vol->nr_clusters = 0x%Lx", (long long)vol->nr_clusters);
ll = sle64_to_cpu(b->mft_lcn);
if (ll >= vol->nr_clusters) {
@@ -569,5 +569,5 @@
}
vol->mft_lcn = ll;
- ntfs_debug("vol->mft_lcn = 0x%Lx\n", (long long)vol->mft_lcn);
+ ntfs_debug("vol->mft_lcn = 0x%Lx", (long long)vol->mft_lcn);
ll = sle64_to_cpu(b->mftmirr_lcn);
if (ll >= vol->nr_clusters) {
@@ -577,7 +577,7 @@
}
vol->mftmirr_lcn = ll;
- ntfs_debug("vol->mftmirr_lcn = 0x%Lx\n", (long long)vol->mftmirr_lcn);
+ ntfs_debug("vol->mftmirr_lcn = 0x%Lx", (long long)vol->mftmirr_lcn);
vol->serial_no = le64_to_cpu(b->volume_serial_number);
- ntfs_debug("vol->serial_no = 0x%Lx\n",
+ ntfs_debug("vol->serial_no = 0x%Lx",
(unsigned long long)vol->serial_no);
/*
@@ -604,11 +604,11 @@
break;
}
- ntfs_debug("vol->mft_zone_multiplier = 0x%x\n",
+ ntfs_debug("vol->mft_zone_multiplier = 0x%x",
vol->mft_zone_multiplier);
vol->mft_zone_start = vol->mft_lcn;
vol->mft_zone_end += vol->mft_lcn;
- ntfs_debug("vol->mft_zone_start = 0x%Lx\n",
+ ntfs_debug("vol->mft_zone_start = 0x%Lx",
(long long)vol->mft_zone_start);
- ntfs_debug("vol->mft_zone_end = 0x%Lx\n", (long long)vol->mft_zone_end);
+ ntfs_debug("vol->mft_zone_end = 0x%Lx", (long long)vol->mft_zone_end);
/* And another misplaced defaults setting. */
if (!vol->on_errors)
@@ -632,5 +632,5 @@
int i, max;
- ntfs_debug("Entering.\n");
+ ntfs_debug("Entering.");
/* Read upcase table and setup vol->upcase and vol->upcase_len. */
ino = iget(sb, FILE_UpCase);
@@ -681,5 +681,5 @@
}
vol->upcase_len = ino->i_size >> 1 /* uchar_t_size_shift */;
- ntfs_debug("Read %Lu bytes from $UpCase (expected %u bytes).\n",
+ ntfs_debug("Read %Lu bytes from $UpCase (expected %u bytes).",
ino->i_size, 64 * 1024 * sizeof(uchar_t));
iput(ino);
@@ -687,5 +687,5 @@
if (!default_upcase) {
ntfs_debug("Using volume specified $UpCase since default is "
- "not present.\n");
+ "not present.");
up(&ntfs_lock);
return TRUE;
@@ -704,10 +704,10 @@
up(&ntfs_lock);
ntfs_debug("Volume specified $UpCase matches default. Using "
- "default.\n");
+ "default.");
return TRUE;
}
up(&ntfs_lock);
ntfs_debug("Using volume specified $UpCase since it does not match "
- "the default.\n");
+ "the default.");
return TRUE;
iput_upcase_failed:
@@ -751,5 +751,5 @@
run_list *rl;
- ntfs_debug("Entering.\n");
+ ntfs_debug("Entering.");
/*
* We have $MFT already (vol->mft_ino) but we need to setup access to
@@ -854,5 +854,5 @@
"$MFT/$BITMAP. Driver bug or corrupt $MFT. "
"Run chkdsk.");
- ntfs_debug("highest_vcn = 0x%Lx, last_vcn - 1 = 0x%Lx\n",
+ ntfs_debug("highest_vcn = 0x%Lx, last_vcn - 1 = 0x%Lx",
(long long)highest_vcn,
(long long)last_vcn - 1);
@@ -1041,5 +1041,5 @@
ntfs_volume *vol = NTFS_SB(vfs_sb);
- ntfs_debug("Entering.\n");
+ ntfs_debug("Entering.");
iput(vol->vol_ino);
vol->vol_ino = NULL;
@@ -1123,5 +1123,5 @@
u32 *b;
- ntfs_debug("Entering.\n");
+ ntfs_debug("Entering.");
/* Serialize accesses to the cluster bitmap. */
down_read(&vol->lcnbmp_lock);
@@ -1133,5 +1133,5 @@
/* Use multiples of 4 bytes. */
max_size = PAGE_CACHE_SIZE >> 2;
- ntfs_debug("Reading $BITMAP, max_index = 0x%lx, max_size = 0x%x.\n",
+ ntfs_debug("Reading $BITMAP, max_index = 0x%lx, max_size = 0x%x.",
max_index, max_size);
for (index = 0UL; index < max_index;) {
@@ -1146,5 +1146,5 @@
if (IS_ERR(page)) {
ntfs_debug("Sync read_cache_page() error. Skipping "
- "page (index 0x%lx).\n", index - 1);
+ "page (index 0x%lx).", index - 1);
continue;
}
@@ -1152,5 +1152,5 @@
if (!Page_Uptodate(page)) {
ntfs_debug("Async read_cache_page() error. Skipping "
- "page (index 0x%lx).\n", index - 1);
+ "page (index 0x%lx).", index - 1);
/* Ignore pages which errored asynchronously. */
page_cache_release(page);
@@ -1173,12 +1173,12 @@
/* If there is a partial page go back and do it. */
if (max_size) {
- ntfs_debug("Handling partial page, max_size = 0x%x.\n",
+ ntfs_debug("Handling partial page, max_size = 0x%x.",
max_size);
goto handle_partial_page;
}
}
- ntfs_debug("Finished reading $BITMAP, last index = 0x%lx\n", index - 1);
+ ntfs_debug("Finished reading $BITMAP, last index = 0x%lx", index - 1);
up_read(&vol->lcnbmp_lock);
- ntfs_debug("Exiting.\n");
+ ntfs_debug("Exiting.");
return nr_free;
}
@@ -1204,5 +1204,5 @@
u32 *b;
- ntfs_debug("Entering.\n");
+ ntfs_debug("Entering.");
/* Serialize accesses to the inode bitmap. */
down_read(&vol->mftbmp_lock);
@@ -1217,5 +1217,5 @@
max_size = PAGE_CACHE_SIZE >> 2;
ntfs_debug("Reading $MFT/$BITMAP, max_index = 0x%lx, max_size = "
- "0x%x.\n", max_index, max_size);
+ "0x%x.", max_index, max_size);
for (index = 0UL; index < max_index;) {
handle_partial_page:
@@ -1229,5 +1229,5 @@
if (IS_ERR(page)) {
ntfs_debug("Sync read_cache_page() error. Skipping "
- "page (index 0x%lx).\n", index - 1);
+ "page (index 0x%lx).", index - 1);
continue;
}
@@ -1235,5 +1235,5 @@
if (!Page_Uptodate(page)) {
ntfs_debug("Async read_cache_page() error. Skipping "
- "page (index 0x%lx).\n", index - 1);
+ "page (index 0x%lx).", index - 1);
/* Ignore pages which errored asynchronously. */
page_cache_release(page);
@@ -1259,13 +1259,13 @@
if ((i = vol->nr_mft_records & 31))
nr_free -= (s64)(32 - i);
- ntfs_debug("Handling partial page, max_size = 0x%x\n",
+ ntfs_debug("Handling partial page, max_size = 0x%x",
max_size);
goto handle_partial_page;
}
}
- ntfs_debug("Finished reading $MFT/$BITMAP, last index = 0x%lx\n",
+ ntfs_debug("Finished reading $MFT/$BITMAP, last index = 0x%lx",
index - 1);
up_read(&vol->mftbmp_lock);
- ntfs_debug("Exiting.\n");
+ ntfs_debug("Exiting.");
return nr_free;
}
@@ -1294,5 +1294,5 @@
s64 size;
- ntfs_debug("Entering.\n");
+ ntfs_debug("Entering.");
/* Type of filesystem. */
sfs->f_type = NTFS_SB_MAGIC;
@@ -1416,5 +1416,5 @@
kdev_t dev = sb->s_dev;
- ntfs_debug("Entering.\n");
+ ntfs_debug("Entering.");
/* Allocate a new ntfs_volume and place it in sb->u.generic_sbp. */
sb->u.generic_sbp = kmalloc(sizeof(ntfs_volume), GFP_NOFS);
@@ -1599,5 +1599,5 @@
/* We increment i_count simulating an iget(). */
atomic_inc(&vol->root_ino->i_count);
- ntfs_debug("Exiting, status successful.\n");
+ ntfs_debug("Exiting, status successful.");
/* Release the default upcase if it has no users. */
down(&ntfs_lock);
@@ -1677,5 +1677,5 @@
kfree(vol);
imm_err_out_now:
- ntfs_debug("Exiting, status failed.\n");
+ ntfs_debug("Exiting, status failed.");
return NULL;
}
@@ -1740,5 +1740,5 @@
"]. Copyright (c) 2001 Anton Altaparmakov.\n");
- ntfs_debug("Debug messages are enabled.\n");
+ ntfs_debug("Debug messages are enabled.");
ntfs_attr_ctx_cache = kmem_cache_create("ntfs_actx_cache",
@@ -1784,5 +1784,5 @@
err = register_filesystem(&ntfs_fs_type);
if (!err) {
- ntfs_debug("NTFS driver registered successfully.\n");
+ ntfs_debug("NTFS driver registered successfully.");
return 0; /* Success! */
}
@@ -1810,5 +1810,5 @@
int err = 0;
- ntfs_debug("Unregistering NTFS driver.\n");
+ ntfs_debug("Unregistering NTFS driver.");
unregister_filesystem(&ntfs_fs_type);
|
