X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Flibhdfs.c;h=eb55c3c549e880eb9abfeef8ab2093095e15bc7b;hb=5561e9dddca8479f182f0269a760dcabe7ff59ad;hp=37694fafcb0269231c34d1fba6b2d26ca0855cdf;hpb=4634d057febe9b4d7028e6f02963a8fd8996ac6a;p=fio.git

diff --git a/engines/libhdfs.c b/engines/libhdfs.c
index 37694faf..eb55c3c5 100644
--- a/engines/libhdfs.c
+++ b/engines/libhdfs.c
@@ -2,7 +2,7 @@
  * libhdfs engine
  *
  * this engine helps perform read/write operations on hdfs cluster using
- * libhdfs. hdfs doesnot support modification of data once file is created.
+ * libhdfs. hdfs does not support modification of data once file is created.
  *
  * so to mimic that create many files of small size (e.g 256k), and this
  * engine select a file based on the offset generated by fio.
@@ -75,7 +75,7 @@ static struct fio_option options[] = {
 		.type	= FIO_OPT_STR_STORE,
 		.off1   = offsetof(struct hdfsio_options, directory),
 		.def    = "/",
-		.help	= "The HDFS directory where fio will create chuncks",
+		.help	= "The HDFS directory where fio will create chunks",
 		.category = FIO_OPT_C_ENGINE,
 		.group	= FIO_OPT_G_HDFS,
 	},
@@ -86,7 +86,7 @@ static struct fio_option options[] = {
 		.type	= FIO_OPT_INT,
 		.off1	= offsetof(struct hdfsio_options, chunck_size),
 		.def    = "1048576",
-		.help	= "Size of individual chunck",
+		.help	= "Size of individual chunk",
 		.category = FIO_OPT_C_ENGINE,
 		.group	= FIO_OPT_G_HDFS,
 	},
@@ -165,8 +165,8 @@ static int fio_hdfsio_prep(struct thread_data *td, struct io_u *io_u)
 	return 0;
 }
 
-static enum fio_q_status
-fio_hdfsio_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status fio_hdfsio_queue(struct thread_data *td,
+					  struct io_u *io_u)
 {
 	struct hdfsio_data *hd = td->io_ops_data;
 	struct hdfsio_options *options = td->eo;
@@ -177,7 +177,7 @@ fio_hdfsio_queue(struct thread_data *td, struct io_u *io_u)
 	
 	if( (io_u->ddir == DDIR_READ || io_u->ddir == DDIR_WRITE) && 
 	     hdfsTell(hd->fs, hd->fp) != offset && hdfsSeek(hd->fs, hd->fp, offset) != 0 ) {
-		log_err("hdfs: seek failed: %s, are you doing random write smaller than chunck size ?\n", strerror(errno));
+		log_err("hdfs: seek failed: %s, are you doing random write smaller than chunk size ?\n", strerror(errno));
 		io_u->error = errno;
 		return FIO_Q_COMPLETED;
 	};
@@ -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;
@@ -338,9 +338,9 @@ static int fio_hdfsio_setup(struct thread_data *td)
 		}
 		f->real_file_size = file_size;
 	}
-	/* If the size doesn't divide nicely with the chunck size,
+	/* If the size doesn't divide nicely with the chunk size,
 	 * make the last files bigger.
-	 * Used only if filesize was not explicitely given
+	 * Used only if filesize was not explicitly given
 	 */
 	if (!td->o.file_size_low && total_file_size < td->o.size) {
 		f->real_file_size += (td->o.size - total_file_size);
@@ -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;
@@ -374,7 +374,7 @@ static int fio_hdfsio_io_u_init(struct thread_data *td, struct io_u *io_u)
 	}
 	hd->fs = hdfsBuilderConnect(bld);
 	
-	/* hdfsSetWorkingDirectory succeed on non existend directory */
+	/* hdfsSetWorkingDirectory succeed on non-existent directory */
 	if (hdfsExists(hd->fs, options->directory) < 0 || hdfsSetWorkingDirectory(hd->fs, options->directory) < 0) {
 		failure = errno;
 		log_err("hdfs: invalid working directory %s: %s\n", options->directory, strerror(errno));
@@ -393,7 +393,7 @@ static void fio_hdfsio_io_u_free(struct thread_data *td, struct io_u *io_u)
 	}
 }
 
-static struct ioengine_ops ioengine_hdfs = {
+FIO_STATIC struct ioengine_ops ioengine = {
 	.name = "libhdfs",
 	.version = FIO_IOOPS_VERSION,
 	.flags = FIO_SYNCIO | FIO_DISKLESSIO | FIO_NODISKUTIL,
@@ -412,10 +412,10 @@ static struct ioengine_ops ioengine_hdfs = {
 
 static void fio_init fio_hdfsio_register(void)
 {
-	register_ioengine(&ioengine_hdfs);
+	register_ioengine(&ioengine);
 }
 
 static void fio_exit fio_hdfsio_unregister(void)
 {
-	unregister_ioengine(&ioengine_hdfs);
+	unregister_ioengine(&ioengine);
 }