[Libguestfs] [PATCH nbdkit 6/9] nbd: Don't cache nbd_aio_get_fd in the handle.

[Richard W.M. Jones]

It's not necessary to cache this, and the libnbd API doesn't guarantee
that it always stays the same.
---
 plugins/nbd/nbd.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/plugins/nbd/nbd.c b/plugins/nbd/nbd.c
index 20c06e2a..8997174e 100644
--- a/plugins/nbd/nbd.c
+++ b/plugins/nbd/nbd.c
@@ -71,7 +71,6 @@ struct transaction {
 struct handle {
   /* These fields are read-only once initialized */
   struct nbd_handle *nbd;
-  int fd; /* Cache of nbd_aio_get_fd */
   int fds[2]; /* Pipe for kicking the reader thread */
   bool readonly;
   pthread_t reader;
@@ -316,7 +315,7 @@ nbdplug_reader (void *handle)
 
   while (!nbd_aio_is_dead (h->nbd) && !nbd_aio_is_closed (h->nbd)) {
     struct pollfd fds[2] = {
-      [0].fd = h->fd,
+      [0].fd = nbd_aio_get_fd (h->nbd),
       [1].fd = h->fds[0],
       [1].events = POLLIN,
     };
@@ -469,7 +468,6 @@ nbdplug_open_handle (int readonly)
 #endif
 
  retry:
-  h->fd = -1;
   h->nbd = nbd_create ();
   if (!h->nbd)
     goto err;
@@ -505,9 +503,6 @@ nbdplug_open_handle (int readonly)
     }
     goto err;
   }
-  h->fd = nbd_aio_get_fd (h->nbd);
-  if (h->fd == -1)
-    goto err;
 
   if (readonly)
     h->readonly = true;
-- 
2.25.0