Skip to content

Commit

Permalink
Merge branch 'pu/typos' of https://github.com/guillemj/liburing
Browse files Browse the repository at this point in the history
* 'pu/typos' of https://github.com/guillemj/liburing:
  Fix typos
  man/io_uring_queue_init.3: Fix typo
  • Loading branch information
axboe committed Nov 20, 2023
2 parents 98f198b + 2c89b57 commit b2cfad6
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Building liburing
# Prepare build config (optional).
#
# --cc specifies the C compiler.
# --cxx speficies the C++ compiler.
# --cxx specifies the C++ compiler.
#
./configure --cc=gcc --cxx=g++;

Expand Down
2 changes: 1 addition & 1 deletion make-debs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ if [ "$cur_ver" != "$version-1" ]; then
$DCH -D $distro --force-distribution -b -v "$version-1" "new version"
fi

# Create tar archieve
# Create tar archive
cd ../
tar cvzf ${outfile}.tar.gz ${outfile}
ln -s ${outfile}.tar.gz ${orgfile}.orig.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion man/io_uring_queue_init.3
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ the ring enters a CQ ring overflow state. Otherwise it drops the CQEs and
increments
.I cq.koverflow
in
.I stuct io_uring
.I struct io_uring
with the number of CQEs dropped. The overflow state is indicated by
.B IORING_SQ_CQ_OVERFLOW
being set in the SQ ring flags. Unless the kernel runs out of available memory,
Expand Down
2 changes: 1 addition & 1 deletion man/io_uring_register.2
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ must be set to an
pointer to an array of two values, with the values in the array being set to
the maximum count of workers per NUMA node. Index 0 holds the bounded worker
count, and index 1 holds the unbounded worker count. On successful return, the
passed in array will contain the previous maximum valyes for each type. If the
passed in array will contain the previous maximum values for each type. If the
count being passed in is 0, then this command returns the current maximum values
and doesn't modify the current setting.
.I nr_args
Expand Down
2 changes: 1 addition & 1 deletion src/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ static int io_uring_queue_init_try_nosqarr(unsigned entries, struct io_uring *ri
* Like io_uring_queue_init_params(), except it allows the application to pass
* in a pre-allocated memory range that is used for the shared data between
* the kernel and the application. This includes the sqes array, and the two
* rings. The memory must be contigious, the use case here is that the app
* rings. The memory must be contiguous, the use case here is that the app
* allocates a huge page and passes it in.
*
* Returns the number of bytes used in the buffer, the app can then reuse
Expand Down
2 changes: 1 addition & 1 deletion test/eventfd-reg.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ int main(int argc, char *argv[])
return T_EXIT_FAIL;
}

/* Check that registrering again will get -EBUSY */
/* Check that registering again will get -EBUSY */
ret = io_uring_register_eventfd(&ring, evfd[1]);
if (ret != -EBUSY) {
fprintf(stderr, "unexpected 2nd register: %d\n", ret);
Expand Down
2 changes: 1 addition & 1 deletion test/file-verify.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#define MAX_VECS 16

/*
* Can be anything, let's just do something for a bit of parallellism
* Can be anything, let's just do something for a bit of parallelism
*/
#define READ_BATCH 16

Expand Down
2 changes: 1 addition & 1 deletion test/multicqes_drain.c
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ static int test_generic_drain(struct io_uring *ring)
}

sleep(1);
// TODO: randomize event triggerring order
// TODO: randomize event triggering order
for (i = 0; i < max_entry; i++) {
if (si[i].op != multi && si[i].op != single)
continue;
Expand Down
2 changes: 1 addition & 1 deletion test/socket-getsetsock-cmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ static int run_setsockopt_test(struct io_uring *ring, struct fds *sockfds)
return err;
}

/* Send data throughts the sockets */
/* Send data through the sockets */
static void send_data(struct fds *s)
{
int written_bytes;
Expand Down

0 comments on commit b2cfad6

Please sign in to comment.