refactor(vsock): don't lock NullSocket

mkroening · mkroening · commit 47112729e9be · 2025-09-04T09:55:21.000+02:00
diff --git a/src/fd/socket/vsock.rs b/src/fd/socket/vsock.rs
@@ -51,7 +51,7 @@ impl NullSocket {
 }
 
 #[async_trait]
-impl ObjectInterface for async_lock::RwLock<NullSocket> {}
+impl ObjectInterface for NullSocket {}
 
 #[derive(Debug)]
 pub struct Socket {
@@ -444,7 +444,7 @@ impl ObjectInterface for async_lock::RwLock<Socket> {
 
 	async fn accept(&self) -> io::Result<(Arc<dyn ObjectInterface>, Endpoint)> {
 		let (handle, endpoint) = self.write().await.accept().await?;
-		Ok((Arc::new(async_lock::RwLock::new(handle)), endpoint))
+		Ok((Arc::new(handle), endpoint))
 	}
 
 	async fn getpeername(&self) -> io::Result<Option<Endpoint>> {

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ impl NullSocket {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`#[async_trait]`
`54`		`-impl ObjectInterface for async_lock::RwLock<NullSocket> {}`
	`54`	`+impl ObjectInterface for NullSocket {}`
`55`	`55`
`56`	`56`	`#[derive(Debug)]`
`57`	`57`	`pub struct Socket {`
`@@ -444,7 +444,7 @@ impl ObjectInterface for async_lock::RwLock<Socket> {`
`444`	`444`
`445`	`445`	`async fn accept(&self) -> io::Result<(Arc<dyn ObjectInterface>, Endpoint)> {`
`446`	`446`	`let (handle, endpoint) = self.write().await.accept().await?;`
`447`		`- Ok((Arc::new(async_lock::RwLock::new(handle)), endpoint))`
	`447`	`+ Ok((Arc::new(handle), endpoint))`
`448`	`448`	`}`
`449`	`449`
`450`	`450`	`async fn getpeername(&self) -> io::Result<Option<Endpoint>> {`