summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2020-11-05 15:17:11 -0700
committerJens Axboe <axboe@kernel.dk>2020-11-05 15:17:11 -0700
commit0a7511a69ea6ca8ff32d392edf027e31aa614716 (patch)
tree8567aad131d8872fef5927124ab7b38da129d7b0
parentcd120abbdedc3079ee9f318d3311d491da54af35 (diff)
parente2fba3ab0b1ae27fbaf607343be155527c1e8e49 (diff)
downloadfio-0a7511a69ea6ca8ff32d392edf027e31aa614716.tar.gz
fio-0a7511a69ea6ca8ff32d392edf027e31aa614716.tar.bz2
Merge branch 'master' of https://github.com/albert-chang0/fio
* 'master' of https://github.com/albert-chang0/fio: engines/hdfs: swap fio_hdfsio_init and fio_hdfsio_io_u_init Makefile: fix usage of JAVA_HOME environmental variable
-rw-r--r--Makefile2
-rw-r--r--engines/libhdfs.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 48788f24..8c8a8fce 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ SOURCE := $(sort $(patsubst $(SRCDIR)/%,%,$(wildcard $(SRCDIR)/crc/*.c)) \
ifdef CONFIG_LIBHDFS
HDFSFLAGS= -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/linux -I $(FIO_LIBHDFS_INCLUDE)
- HDFSLIB= -Wl,-rpath $(JAVA_HOME)/jre/lib/$(FIO_HDFS_CPU)/server -L$(JAVA_HOME)/jre/lib/$(FIO_HDFS_CPU)/server $(FIO_LIBHDFS_LIB)/libhdfs.a -ljvm
+ HDFSLIB= -Wl,-rpath $(JAVA_HOME)/lib/$(FIO_HDFS_CPU)/server -L$(JAVA_HOME)/lib/$(FIO_HDFS_CPU)/server $(FIO_LIBHDFS_LIB)/libhdfs.a -ljvm
FIO_CFLAGS += $(HDFSFLAGS)
SOURCE += engines/libhdfs.c
endif
diff --git a/engines/libhdfs.c b/engines/libhdfs.c
index 9ca82f78..eb55c3c5 100644
--- a/engines/libhdfs.c
+++ b/engines/libhdfs.c
@@ -240,7 +240,7 @@ int fio_hdfsio_close_file(struct thread_data *td, struct fio_file *f)
return 0;
}
-static int fio_hdfsio_init(struct thread_data *td)
+static int fio_hdfsio_io_u_init(struct thread_data *td, struct io_u *io_u)
{
struct hdfsio_options *options = td->eo;
struct hdfsio_data *hd = td->io_ops_data;
@@ -349,7 +349,7 @@ static int fio_hdfsio_setup(struct thread_data *td)
return 0;
}
-static int fio_hdfsio_io_u_init(struct thread_data *td, struct io_u *io_u)
+static int fio_hdfsio_init(struct thread_data *td)
{
struct hdfsio_data *hd = td->io_ops_data;
struct hdfsio_options *options = td->eo;