Skip to content

Commit 7377e72

Browse files
authored
Merge pull request #1062 from mulkieran/MSRV-1.89.0
Increase MSRV to 1.89.0
2 parents 22a7cd8 + 292ef1e commit 7377e72

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ categories = ["os::linux-apis", "api-bindings"]
1010
keywords = ["Linux", "device", "mapper", "libdm", "storage"]
1111
license = "MPL-2.0"
1212
edition = "2024"
13-
rust-version = "1.87.0" # LOWEST SUPPORTED RUST TOOLCHAIN
13+
rust-version = "1.89.0" # LOWEST SUPPORTED RUST TOOLCHAIN
1414
exclude = [".clippy.toml", ".githooks/*", ".gitignore", ".github/*", "Makefile"]
1515

1616
[dependencies.bitflags]

‎devicemapper-rs-sys/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "devicemapper-sys"
33
version = "0.3.3"
44
authors = ["Stratis Developers <stratis-devel@lists.fedorahosted.org>"]
55
edition = "2024"
6-
rust-version = "1.87.0" # LOWEST SUPPORTED RUST TOOLCHAIN
6+
rust-version = "1.89.0" # LOWEST SUPPORTED RUST TOOLCHAIN
77
description = "Low level bindings for devicemapper"
88
license = "MPL-2.0"
99
documentation = "https://docs.rs/devicemapper-rs-sys"

‎src/core/dm_udev_sync.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -343,14 +343,14 @@ pub mod sync_semaphore {
343343
fn end(self, flags: u32) -> DmResult<()> {
344344
if self.is_active() {
345345
let semid = self.semid.expect("active UdevSync must have valid semid");
346-
if (flags & DmFlags::DM_UEVENT_GENERATED.bits()) == 0 {
347-
if let Err(err) = notify_sem_dec(self.cookie, semid) {
348-
error!("Failed to clear notification semaphore state: {err}");
349-
if let Err(err2) = notify_sem_destroy(self.cookie, semid) {
350-
error!("Failed to clean up notification semaphore: {err2}");
351-
}
352-
return Err(err);
346+
if (flags & DmFlags::DM_UEVENT_GENERATED.bits()) == 0
347+
&& let Err(err) = notify_sem_dec(self.cookie, semid)
348+
{
349+
error!("Failed to clear notification semaphore state: {err}");
350+
if let Err(err2) = notify_sem_destroy(self.cookie, semid) {
351+
error!("Failed to clean up notification semaphore: {err2}");
353352
}
353+
return Err(err);
354354
}
355355
trace!("Waiting on {self:?}");
356356
notify_sem_wait(self.cookie, semid)?;

0 commit comments

Comments
 (0)