diff --git a/ntfsprogs/ntfscp.c b/ntfsprogs/ntfscp.c index dc857e46..de7d61f4 100644 --- a/ntfsprogs/ntfscp.c +++ b/ntfsprogs/ntfscp.c @@ -246,7 +246,6 @@ int main (int argc, char *argv[]) int flags = 0; int result = 1; s64 new_size; - int need_logfile_reset = 0; u64 offset; char *buf; s64 br, bw; @@ -323,7 +322,6 @@ int main (int argc, char *argv[]) perror("ERROR: Couldn't add attribute"); goto close_dst; } - need_logfile_reset = 1; } Vprintf("Old file size: %lld\n", na->data_size); @@ -332,7 +330,6 @@ int main (int argc, char *argv[]) perror("ERROR: Couldn't resize attribute"); goto close_attr; } - need_logfile_reset = 1; } buf = malloc(NTFS_BUF_SIZE); @@ -355,19 +352,12 @@ int main (int argc, char *argv[]) } offset += bw; } - need_logfile_reset = 1; result = 0; free(buf); close_attr: ntfs_attr_close(na); close_dst: ntfs_inode_close(out); - - if (need_logfile_reset) { - printf("Resetting logfile.\n"); - ntfs_logfile_reset (vol); - } - close_src: fclose (in); umount: diff --git a/ntfsprogs/ntfswipe.c b/ntfsprogs/ntfswipe.c index 1c94b093..14955268 100644 --- a/ntfsprogs/ntfswipe.c +++ b/ntfsprogs/ntfswipe.c @@ -1064,6 +1064,9 @@ static s64 wipe_logfile (ntfs_volume *vol, int byte, enum action act) s64 len, pos, count; char buf[NTFS_BUF_SIZE2]; int eo; + + /* We can wipe logfile only with 0xff. */ + byte = 0xff; if (!vol || (byte < 0)) return -1; @@ -1384,14 +1387,6 @@ int main (int argc, char *argv[]) printf ("%lld bytes were wiped\n", (long long)total); } - /* - * We need to reset the logfile so Windows can boot and so journal - * replay does not cause corruption. - */ - if (act != act_info) { - printf ("Resetting logfile.\n"); - ntfs_logfile_reset(vol); - } if (ntfs_volume_set_flags (vol, VOLUME_IS_DIRTY) < 0) { Eprintf ("Couldn't mark volume dirty\n"); }