Merge pull request containerd#92 from Tim-Zhang/bump-tokio-vsock-0.3.1

Bump tokio-vsock to 0.3.1 and remove hack code for it
retrage · May 26, 2021 · 8f17b61 · 8f17b61
2 parents 6dcadbf + c3eeb76
commit 8f17b61
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,7 +22,7 @@ thiserror = "1.0"
 async-trait = { version = "0.1.31", optional = true }
 tokio = { version = "1", features = ["rt", "sync", "io-util", "macros", "time"], optional = true }
 futures = { version = "0.3", optional = true }
-tokio-vsock = { version = "0.3", optional = true }
+tokio-vsock = { version = "0.3.1", optional = true }
 
 [build-dependencies]
 protobuf-codegen-pure = "2.14.0"

diff --git a/src/asynchronous/server.rs b/src/asynchronous/server.rs
@@ -167,12 +167,6 @@ impl Server {
                             // Accept a new connection
                             match conn {
                                 Ok(stream) => {
-                                    let fd = stream.as_raw_fd();
-                                    if let Err(e) = common::set_fd_close_exec(fd) {
-                                        error!("{:?}", e);
-                                        continue;
-                                    }
-
                                     // spawn a connection handler, would not block
                                     spawn_connection_handler(
                                         listenfd,