search for: nbd_aio_trim_callback

Reverts commit 387cbe67c3db27e8a61117fedb6e7fad76e409ef. --- generator/generator | 18 +++++++++++++++++- lib/handle.c | 28 +++++++++++++++++++++++++++- tests/closure-lifetimes.c | 4 +++- 3 files changed, 47 insertions(+), 3 deletions(-) diff --git a/generator/generator b/generator/generator index 2cd83f1..25e4aa5 100755 --- a/generator/generator +++ b/generator/generator

libnbd 0.1.7 was released today, which breaks compilation of nbdkit-nbd-plugin. We could work around it by using #ifdef LIBNBD_HAVE_XXX to learn about the renamed functions, but supporting older versions is not all that important when we don't yet have API stability. So patch 1 copes by just bumping the minimum version instead, except that we have yet another pending libnbd patch with an API

...nbdplug_notify, &s, f)); return nbdplug_reply (h, &s); } @@ -724,7 +724,7 @@ nbdplug_trim (void *handle, uint32_t count, uint64_t offset, uint32_t flags) assert (!(flags & ~NBDKIT_FLAG_FUA)); nbdplug_prepare (&s); nbdplug_register (h, &s, nbd_aio_trim_callback (h->nbd, count, offset, - &s, nbdplug_notify, f)); + nbdplug_notify, &s, f)); return nbdplug_reply (h, &s); } @@ -738,7 +738,7 @@ nbdplug_flush (void *handle, uint32_t flags) ass...

...yet. */ + /* Issue a read and trim that should not complete yet. Set up the + * trim to auto-retire via callback. + */ if ((cookie = nbd_aio_pread (nbd, buf, sizeof buf, 0, 0)) == -1) { fprintf (stderr, "%s: test failed: nbd_aio_pread\n", argv[0]); goto fail; } + if (nbd_aio_trim_callback (nbd, sizeof buf, 0, callback, NULL, 0) == -1) { + fprintf (stderr, "%s: test failed: nbd_aio_trim_callback\n", argv[0]); + goto fail; + } if (nbd_aio_peek_command_completed (nbd) != 0) { fprintf (stderr, "%s: test failed: nbd_aio_peek_command_completed\n",...

...= "send trim command to the NBD server"; - longdesc = "\ -Issue a trim command to the NBD server. This returns the -unique positive 64 bit cookie for this command, or C<-1> on -error. To check if the command completed, call -C<nbd_aio_command_completed>, or use C<nbd_aio_trim_callback>. -Parameters behave as documented in C<nbd_trim>."; - }; - - "aio_trim_callback", { default_call with args = [ UInt64 "count"; UInt64 "offset" ]; optargs = [ OClosure completion_closure; OFlags ("flags", cmd_flags) ]; ret...

This applies on top of the OClosure v2 series posted a few minutes ago. Rich.

...;s, nbd_aio_zero (h->nbd, count, offset, s.cb, f)); return nbdplug_reply (h, &s); } @@ -744,8 +745,7 @@ nbdplug_trim (void *handle, uint32_t count, uint64_t offset, uint32_t flags) assert (!(flags & ~NBDKIT_FLAG_FUA)); nbdplug_prepare (&s); - nbdplug_register (h, &s, nbd_aio_trim_callback (h->nbd, count, offset, - nbdplug_notify, &s, f)); + nbdplug_register (h, &s, nbd_aio_trim (h->nbd, count, offset, s.cb, f)); return nbdplug_reply (h, &s); } @@ -758,23 +758,17 @@ nbdplug_flush (void *handle, uint32_t flags)...