From 21f05ebb4fb0ddf1f148d9b5329c9259297ed3c7 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Mon, 6 Jan 2025 18:09:19 +0000 Subject: [PATCH] vhost_user_block: Automatically fix operator precedence clippy warning Signed-off-by: Rob Bradford --- vhost_user_block/src/lib.rs | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/vhost_user_block/src/lib.rs b/vhost_user_block/src/lib.rs index 5e942a530..abfb58964 100644 --- a/vhost_user_block/src/lib.rs +++ b/vhost_user_block/src/lib.rs @@ -273,13 +273,14 @@ impl VhostUserBlkBackend { fn update_writeback(&mut self) { // Use writeback from config if VIRTIO_BLK_F_CONFIG_WCE - let writeback = - if self.acked_features & 1 << VIRTIO_BLK_F_CONFIG_WCE == 1 << VIRTIO_BLK_F_CONFIG_WCE { - self.config.writeback == 1 - } else { - // Else check if VIRTIO_BLK_F_FLUSH negotiated - self.acked_features & 1 << VIRTIO_BLK_F_FLUSH == 1 << VIRTIO_BLK_F_FLUSH - }; + let writeback = if self.acked_features & (1 << VIRTIO_BLK_F_CONFIG_WCE) + == 1 << VIRTIO_BLK_F_CONFIG_WCE + { + self.config.writeback == 1 + } else { + // Else check if VIRTIO_BLK_F_FLUSH negotiated + self.acked_features & (1 << VIRTIO_BLK_F_FLUSH) == 1 << VIRTIO_BLK_F_FLUSH + }; info!( "Changing cache mode to {}", @@ -306,14 +307,14 @@ impl VhostUserBackendMut for VhostUserBlkBackend { } fn features(&self) -> u64 { - let mut avail_features = 1 << VIRTIO_BLK_F_SEG_MAX - | 1 << VIRTIO_BLK_F_BLK_SIZE - | 1 << VIRTIO_BLK_F_FLUSH - | 1 << VIRTIO_BLK_F_TOPOLOGY - | 1 << VIRTIO_BLK_F_MQ - | 1 << VIRTIO_BLK_F_CONFIG_WCE - | 1 << VIRTIO_RING_F_EVENT_IDX - | 1 << VIRTIO_F_VERSION_1 + let mut avail_features = (1 << VIRTIO_BLK_F_SEG_MAX) + | (1 << VIRTIO_BLK_F_BLK_SIZE) + | (1 << VIRTIO_BLK_F_FLUSH) + | (1 << VIRTIO_BLK_F_TOPOLOGY) + | (1 << VIRTIO_BLK_F_MQ) + | (1 << VIRTIO_BLK_F_CONFIG_WCE) + | (1 << VIRTIO_RING_F_EVENT_IDX) + | (1 << VIRTIO_F_VERSION_1) | VhostUserVirtioFeatures::PROTOCOL_FEATURES.bits(); if self.rdonly {