- 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
This commit is contained in:
Aleksey Bragin 2008-08-03 12:50:10 +00:00
parent 56184fa149
commit b77c380ad7
3 changed files with 10 additions and 14 deletions

View file

@ -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;

View file

@ -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;

View file

@ -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;
}