X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filehash.c;h=1df7db0c2f2d754fd4ae7bbc674ac408d7ea7848;hp=a00ac7885721c60b839f0b6c26144f6355b065a9;hb=715d2b3e02834232154604b91de1f9db53572a77;hpb=b950781e189961b934c5a26372ae4ec5fd384799;ds=sidebyside

diff --git a/filehash.c b/filehash.c
index a00ac788..1df7db0c 100644
--- a/filehash.c
+++ b/filehash.c
@@ -22,10 +22,10 @@ void remove_file_hash(struct fio_file *f)
 {
 	fio_mutex_down(hash_lock);
 
-	if (f->flags & FIO_FILE_HASHED) {
+	if (fio_file_hashed(f)) {
 		assert(!flist_empty(&f->hash_list));
 		flist_del_init(&f->hash_list);
-		f->flags &= ~FIO_FILE_HASHED;
+		fio_file_clear_hashed(f);
 	}
 
 	fio_mutex_up(hash_lock);
@@ -39,6 +39,9 @@ static struct fio_file *__lookup_file_hash(const char *name)
 	flist_for_each(n, bucket) {
 		struct fio_file *f = flist_entry(n, struct fio_file, hash_list);
 
+		if (!f->file_name)
+			continue;
+
 		if (!strcmp(f->file_name, name)) {
 			assert(f->fd != -1);
 			return f;
@@ -62,7 +65,7 @@ struct fio_file *add_file_hash(struct fio_file *f)
 {
 	struct fio_file *alias;
 
-	if (f->flags & FIO_FILE_HASHED)
+	if (fio_file_hashed(f))
 		return NULL;
 
 	INIT_FLIST_HEAD(&f->hash_list);
@@ -71,7 +74,7 @@ struct fio_file *add_file_hash(struct fio_file *f)
 
 	alias = __lookup_file_hash(f->file_name);
 	if (!alias) {
-		f->flags |= FIO_FILE_HASHED;
+		fio_file_set_hashed(f);
 		flist_add_tail(&f->hash_list, &file_hash[hash(f->file_name)]);
 	}