X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=diskutil.c;h=27ddb46b7fecdae75114874210ed2ae135d21bd6;hp=a1077d4001459a159c37076478fa4e04f882ecc8;hb=cf8775b8badd332973dd580471492423075224e6;hpb=087d0ed0d9b5b763e3bd50ad225b3b25897904bb diff --git a/diskutil.c b/diskutil.c index a1077d40..27ddb46b 100644 --- a/diskutil.c +++ b/diskutil.c @@ -292,10 +292,8 @@ static struct disk_util *disk_util_add(struct thread_data *td, int majdev, dprint(FD_DISKUTIL, "add maj/min %d/%d: %s\n", majdev, mindev, path); du = smalloc(sizeof(*du)); - if (!du) { - log_err("fio: smalloc() pool exhausted\n"); + if (!du) return NULL; - } memset(du, 0, sizeof(*du)); INIT_FLIST_HEAD(&du->list); @@ -491,7 +489,7 @@ void init_disk_util(struct thread_data *td) unsigned int i; if (!td->o.do_disk_util || - (td->io_ops->flags & (FIO_DISKLESSIO | FIO_NODISKUTIL))) + td_ioengine_flagged(td, FIO_DISKLESSIO | FIO_NODISKUTIL)) return; for_each_file(td, f, i)