From b77c380ad7baf96f546d415122c2e866f445c169 Mon Sep 17 00:00:00 2001 From: Aleksey Bragin Date: Sun, 3 Aug 2008 12:50:10 +0000 Subject: [PATCH] - Revert my no_change_list modification, it turns out it's not needed, since when write_immed is set, changes aren't added to the list. svn path=/trunk/; revision=35067 --- .../applications/sysutils/dosfsck/dosfsck.c | 2 +- .../applications/sysutils/dosfsck/dosfsck.h | 2 +- rosapps/applications/sysutils/dosfsck/io.c | 20 ++++++++----------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/rosapps/applications/sysutils/dosfsck/dosfsck.c b/rosapps/applications/sysutils/dosfsck/dosfsck.c index 7c015421dfc..15daf1bc686 100644 --- a/rosapps/applications/sysutils/dosfsck/dosfsck.c +++ b/rosapps/applications/sysutils/dosfsck/dosfsck.c @@ -24,7 +24,7 @@ #include "check.h" -int interactive = 0,list = 0,test = 0,verbose = 0,write_immed = 0,no_change_list=0; +int interactive = 0,list = 0,test = 0,verbose = 0,write_immed = 0; int atari_format = 0; unsigned n_files = 0; void *mem_queue = NULL; diff --git a/rosapps/applications/sysutils/dosfsck/dosfsck.h b/rosapps/applications/sysutils/dosfsck/dosfsck.h index 0f44735f4a2..3789b8fdf7f 100644 --- a/rosapps/applications/sysutils/dosfsck/dosfsck.h +++ b/rosapps/applications/sysutils/dosfsck/dosfsck.h @@ -162,7 +162,7 @@ typedef struct { #define offsetof(t,e) ((int)&(((t *)0)->e)) #endif -extern int interactive,list,verbose,test,write_immed,no_change_list; +extern int interactive,list,verbose,test,write_immed; extern int atari_format; extern unsigned n_files; extern void *mem_queue; diff --git a/rosapps/applications/sysutils/dosfsck/io.c b/rosapps/applications/sysutils/dosfsck/io.c index 2aff0a58491..975438f9d16 100644 --- a/rosapps/applications/sysutils/dosfsck/io.c +++ b/rosapps/applications/sysutils/dosfsck/io.c @@ -194,16 +194,14 @@ void fs_write(loff_t pos,int size,void *data) die("Wrote %d bytes instead of %d at %I64d",did,size,pos); } - if (!no_change_list) - { - new = alloc(sizeof(CHANGE)); - new->pos = pos; - memcpy(new->data = alloc(new->size = size),data,size); - new->next = NULL; - if (last) last->next = new; - else changes = new; - last = new; - } + new = alloc(sizeof(CHANGE)); + new->pos = pos; + memcpy(new->data = alloc(new->size = size),data,size); + new->next = NULL; + if (last) last->next = new; + else changes = new; + last = new; + #else //SAE if (write_immed) { did_change = 1; @@ -230,7 +228,6 @@ static void fs_flush(void) int old_write_immed = write_immed; /* Disable writes to the list now */ - no_change_list = 1; write_immed = 1; while (changes) { @@ -255,7 +252,6 @@ static void fs_flush(void) } /* Restore values */ - no_change_list = 0; write_immed = old_write_immed; }