[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.201,1.202 dir.c,1.49,1.50 mft.c,1.43,1.44
Development moved to https://sourceforge.net/projects/ntfs-3g/
Brought to you by:
antona,
cha0smaster
Menu
▾
▴
[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.201,1.202 dir.c,1.49,1.50 mft.c,1.43,1.44
|
From: Yura P. <cha...@us...> - 2005-12-18 16:27:29
|
Changes by: cha0smaster Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22692/libntfs Modified Files: attrib.c dir.c mft.c Log Message: * Add NTFS_DEV_LIST define. Use it everywhere instead of lin...@li.... * Replace all ntfs_log_trace where we ask to send mail to us with ntfs_log_error Index: attrib.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v retrieving revision 1.201 retrieving revision 1.202 diff -u -p -r1.201 -r1.202 --- attrib.c 4 Dec 2005 22:42:51 -0000 1.201 +++ attrib.c 18 Dec 2005 16:27:20 -0000 1.202 @@ -1220,9 +1220,9 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons * @cur_vcn, because we missed it during * instantiating of the hole. */ - ntfs_log_trace("BUG! Failed to find run after " + ntfs_log_error("BUG! Failed to find run after " "instantiating. Please report " - "to the lin...@li....\n"); + "to the %s.\n", NTFS_DEV_LIST); errno = EIO; goto err_out; } @@ -1231,9 +1231,9 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons rl++; /* Now LCN shoudn't be less than 0. */ if (rl->lcn < 0) { - ntfs_log_trace("BUG! LCN is lesser than 0. Please " - "report to the " - "lin...@li....\n"); + ntfs_log_error("BUG! LCN is lesser than 0. " + "Please report to the %s.\n", + NTFS_DEV_LIST); errno = EIO; goto err_out; } @@ -3969,9 +3969,9 @@ static int ntfs_attr_make_resident(ntfs_ * Bug, because ntfs_attr_record_resize should not fail (we * already checked that attribute fits MFT record). */ - ntfs_log_trace("BUG! Failed to resize attribute record. Please " - "report to the lin...@li.... " - "Aborting...\n"); + ntfs_log_error("BUG! Failed to resize attribute record. " + "Please report to the %s. Aborting...\n", + NTFS_DEV_LIST); errno = EIO; return -1; } @@ -4327,11 +4327,12 @@ retry: if (ntfs_attr_record_resize(m, a, le16_to_cpu(a->mapping_pairs_offset) + mp_size)) { - ntfs_log_trace("BUG! Ran out of space in mft record. " - "Please run chkdsk and if that " - "doesn't find any errors please " - "report you saw this message to " - "lin...@li....\n"); + ntfs_log_error("BUG! Ran out of space in mft " + "record. Please run chkdsk and " + "if that doesn't find any " + "errors please report you saw " + "this message to %s.\n", + NTFS_DEV_LIST); err = EIO; goto put_err_out; } @@ -4357,11 +4358,10 @@ retry: finished_build = TRUE; if (!finished_build && errno != ENOSPC) { err = errno; - ntfs_log_trace("BUG! Mapping pairs build failed. " + ntfs_log_error("BUG! Mapping pairs build failed. " "Please run chkdsk and if that doesn't " "find any errors please report you saw " - "this message to " - "lin...@li....\n"); + "this message to %s.\n", NTFS_DEV_LIST); goto put_err_out; } a->highest_vcn = cpu_to_sle64(stop_vcn - 1); @@ -4452,10 +4452,10 @@ retry: stop_vcn, &stop_vcn); if (err < 0 && errno != ENOSPC) { err = errno; - ntfs_log_trace("BUG! Mapping pairs build failed. Please " - "run chkdsk and if that doesn't find " - "any errors please report you saw this " - "message to lin...@li....\n"); + ntfs_log_error("BUG! Mapping pairs build failed. " + "Please run chkdsk and if that doesn't " + "find any errors please report you saw " + "this message to %s.\n", NTFS_DEV_LIST); if (ntfs_mft_record_free(na->ni->vol, ni)) ntfs_log_trace("Couldn't free MFT record.\n"); goto put_err_out; Index: dir.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -p -r1.49 -r1.50 --- dir.c 4 Dec 2005 22:42:51 -0000 1.49 +++ dir.c 18 Dec 2005 16:27:21 -0000 1.50 @@ -193,12 +193,12 @@ found_it: IGNORE_CASE, vol->upcase, vol->upcase_len)) { /* Only one case insensitive matching name allowed. */ if (mref) { - ntfs_log_debug("Found already cached mft reference " - "in phase 1. Please run " - "chkdsk and if that doesn't " - "find any errors please report " - "you saw this message to " - "lin...@li....\n"); + ntfs_log_error("Found already cached mft " + "reference in phase 1. Please " + "run chkdsk and if that doesn't" + " find any errors please report" + " you saw this message to %s\n", + NTFS_DEV_LIST); goto put_err_out; } mref = le64_to_cpu(ie->indexed_file); @@ -386,12 +386,12 @@ found_it2: IGNORE_CASE, vol->upcase, vol->upcase_len)) { /* Only one case insensitive matching name allowed. */ if (mref) { - ntfs_log_debug("Found already cached mft reference " - "in phase 2. Please run " - "chkdsk and if that doesn't " - "find any errors please report " - "you saw this message to " - "lin...@li....\n"); + ntfs_log_error("Found already cached mft " + "reference in phase 2. Please " + "run chkdsk and if that doesn't" + " find any errors please report" + " you saw this message to %s\n", + NTFS_DEV_LIST); goto close_err_out; } mref = le64_to_cpu(ie->indexed_file); Index: mft.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/mft.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -p -r1.43 -r1.44 --- mft.c 4 Dec 2005 22:42:51 -0000 1.43 +++ mft.c 18 Dec 2005 16:27:21 -0000 1.44 @@ -315,13 +315,12 @@ int ntfs_mft_record_layout(const ntfs_vo NTFS_BLOCK_SIZE + 1); else { mrec->usa_count = cpu_to_le16(1); - ntfs_log_debug("Sector size is bigger than MFT record size. " - "Setting usa_count to 1. If Windows\n"); - ntfs_log_debug("chkdsk reports this as corruption, please email " - "lin...@li...\n"); - ntfs_log_debug("stating that you saw this message and that the " - "file system created was corrupt.\n"); - ntfs_log_debug("Thank you.\n"); + ntfs_log_error("Sector size is bigger than MFT record size. " + "Setting usa_count to 1. If Windows chkdsk " + "reports this as corruption, please email %s " + "stating that you saw this message and that " + "the file system created was corrupt. " + "Thank you.\n", NTFS_DEV_LIST); } /* Set the update sequence number to 1. */ *(u16*)((u8*)mrec + le16_to_cpu(mrec->usa_ofs)) = cpu_to_le16(1); |