From f8136a0b92a9293e7eb71aea27d9da6b6a163d94 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Wed, 28 Aug 2019 21:06:45 +0200 Subject: [SERVER] Reintroduce check whether readFd is actually != -1 --- src/server/image.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/server/image.c b/src/server/image.c index 248c12c..4eab1d2 100644 --- a/src/server/image.c +++ b/src/server/image.c @@ -1725,8 +1725,10 @@ static void* closeUnusedFds(void* nix UNUSED) mutex_lock( &imageListLock ); for ( int i = 0; i < _num_images; ++i ) { dnbd3_image_t * const image = _images[i]; - if ( image == NULL ) + if ( image == NULL || image->readFd == -1 ) continue; + // TODO: Also close for idle uplinks (uplink_connectionShouldShutdown) + // TODO: And close writeFd for idle uplinks.... if ( image->users == 0 && image->uplinkref == NULL && timing_reached( &image->atime, &deadline ) ) { logadd( LOG_DEBUG1, "Inactive fd closed for %s:%d", image->name, (int)image->rid ); fds[fdindex++] = image->readFd; -- cgit v1.2.3-55-g7522