Allow fio headers to be included by a C++ build
The attached patch allows fio 1.17.2 header files to be included by a
C++ build without generating compile errors due to C-ism.
Specifically, due to:
- use of the keyword "new" as a parameter name
- a cast of a return value to void *, when the function signature
returns a different type
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
diff --git a/flist.h b/flist.h
index f28a5ab..e62f4b2 100644
--- a/flist.h
+++ b/flist.h
@@ -41,33 +41,34 @@
* This is only for internal list manipulation where we know
* the prev/next entries already!
*/
-static inline void __flist_add(struct flist_head *new,
+static inline void __flist_add(struct flist_head *new_entry,
struct flist_head *prev,
struct flist_head *next)
{
- next->prev = new;
- new->next = next;
- new->prev = prev;
- prev->next = new;
+ next->prev = new_entry;
+ new_entry->next = next;
+ new_entry->prev = prev;
+ prev->next = new_entry;
}
/**
* flist_add - add a new entry
- * @new: new entry to be added
+ * @new_entry: new entry to be added
* @head: list head to add it after
*
* Insert a new entry after the specified head.
* This is good for implementing stacks.
*/
-static inline void flist_add(struct flist_head *new, struct flist_head *head)
+static inline void flist_add(struct flist_head *new_entry,
+ struct flist_head *head)
{
- __flist_add(new, head, head->next);
+ __flist_add(new_entry, head, head->next);
}
-static inline void flist_add_tail(struct flist_head *new,
+static inline void flist_add_tail(struct flist_head *new_entry,
struct flist_head *head)
{
- __flist_add(new, head->prev, head);
+ __flist_add(new_entry, head->prev, head);
}
/*
diff --git a/os/os-linux.h b/os/os-linux.h
index 791ec7a..c0f5327 100644
--- a/os/os-linux.h
+++ b/os/os-linux.h
@@ -116,7 +116,7 @@
static inline struct syslet_uatom *
async_exec(struct syslet_uatom *atom, struct async_head_user *ahu)
{
- return (void *) syscall(__NR_async_exec, atom, ahu);
+ return (struct syslet_uatom *) syscall(__NR_async_exec, atom, ahu);
}
static inline long