From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EDA9DCCA470 for ; Mon, 6 Oct 2025 20:57:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AC9E310E5F7; Mon, 6 Oct 2025 20:57:56 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=permerror (0-bit key) header.d=gmail.com header.i=@gmail.com header.b="FGBmR7ED"; dkim-atps=neutral Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3658710E945 for ; Thu, 25 Sep 2025 13:56:02 +0000 (UTC) Received: by mail-qv1-f51.google.com with SMTP id 6a1803df08f44-7946137e7a2so8799136d6.0 for ; Thu, 25 Sep 2025 06:56:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758808561; x=1759413361; darn=lists.freedesktop.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Su5ueCqg2TI764Opf/rKiovLX30DsPsrljKG6JdjfP0=; b=FGBmR7EDgbz8TmM9AA1mnKcXdl7ls2yLuJ3kALMjR9PGwnVFq7WOQ/pQWCPXajMQdu 5X4CF3cwE++CkuT9pR206obSSSylKIDU8rUY3FgoYjGOYOqmfadLQCcnrXNbUs/kqEm7 WrvmWE38WP82NmBBsba/m1xqejdAgYC/gw8I9M8NYHziR7RuHWOFWLYY2znPQH49/REK SDDkLi249+OOSGd4Te4yhBT31t5YkksOvENI7OcPZ9/adjCs5AraUNXSwxqrgYiN1Lex Y9EafwUPnG1OssAhYL468Zc+XqJ9BH1uy185HP6Mku20j49ilFECh/DhSQFU9mSC5QOr RFNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758808561; x=1759413361; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Su5ueCqg2TI764Opf/rKiovLX30DsPsrljKG6JdjfP0=; b=PBqhet68KKGTvaC12hukFzV8yHJhHM/b6l6dFsrICj+a5Cc2zzfLLsIDs2Re71qVZi rs1oKym+hGw0TEWNfm5YxJahZHoOSKzzRKJ6u2qlkq2VPcklf6J1gWpKZoewlT3ayLz4 XX8jaBk1xVMh3PEPVwyFUdgucdVMCxNezXHwsdP6f1KpS+X7b02WoSqC+4pFssX0nRAm HxfQfqgvBO8lRoLb1YYK4mRJkE8gdN6COJ8xbq/YJozPd6ESHP4D7AMrAhGXD8qQvWAw +Q5zbQDqI1opysQ9j16Sh26qYd8rQS7KnvaXcvzQPm7PcJdRRtqG6frepuN88anRUukh qWgA== X-Forwarded-Encrypted: i=1; AJvYcCW80Q1bn+ezwDemKuByu9ubZ6+P9y8/nslCMYrhLguTPuY7CfPbxFCLPY7ObSsHjGsy11ZcGRMS@lists.freedesktop.org X-Gm-Message-State: AOJu0YxyKECGoAr8yiZN45CkfueGGS3yj97YJzr0ZFzGCXZ6STlEFaru O8anpJ4+3KfTzKITvPaSSsyOzQAWBrHosVkJD/C6sCyb2JlT3kQCRjv5 X-Gm-Gg: ASbGnctehOo2k3ur8QHvd+eu8/DRIXuuUnjI4pplW6kTvBTYXrqcRXI7UXVaWaHy+/q Gd6xJmbxsr2Ehm8BNtylpidJNkWzTngC7H5DESsOdOgBZfIrrAGW1eGiICgAOk8+WVWxO3m9Fq7 tluHygEm41fhmL/8kRCxCiYTRTvR5B3fDE04Kv6S/fdu3az8LeCy38IOqcomAaTdvAKxAazYTU4 XoTa6qk8EhtiqInWVLC61kVVhce7KTZ9L7zZ4Vrr+iicxgELEKh03pBSXXGf9xW8CeFdKZT5j79 ZfcqoRC1yFDBLzJmlS0O1y5CzdtZJBdRVWLortQP3QUaM2GsnRtgZYj8grHvp2/bdnLCR7gD18p PCj0FJB9Oy5mn52HHuuM/Nr2BS3tfUkHzq+fWJcaj3mAWEPQRjcIxvc0ePkcwKMqW3miC5fh9HL 4fI0XyvQkY8xIf7SA3zS8C9lJfrdFBjkWJzDDvYcEHe9uOFOyXDjPYZrbwPVIshez3ehkk X-Google-Smtp-Source: AGHT+IEKGM1hlb41qJ9YisDvGGBXEq7SIWXMU0HV+6pPjw6gZQj4cUtrGlxKA4Eejw5JCAnnmfC1hg== X-Received: by 2002:a05:6214:2aaa:b0:7ef:4bbc:7767 with SMTP id 6a1803df08f44-7fc400b2947mr55121666d6.52.1758808560892; Thu, 25 Sep 2025 06:56:00 -0700 (PDT) Received: from 137.1.168.192.in-addr.arpa ([2600:4808:6353:5c00:7c:b286:dba3:5ba8]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-80135968d5esm11536916d6.12.2025.09.25.06.55.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 06:56:00 -0700 (PDT) From: Tamir Duberstein Date: Thu, 25 Sep 2025 09:54:05 -0400 Subject: [PATCH v2 17/19] rust: sync: replace `kernel::c_str!` with C-Strings MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250925-core-cstr-cstrings-v2-17-78e0aaace1cd@gmail.com> References: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> In-Reply-To: <20250925-core-cstr-cstrings-v2-0-78e0aaace1cd@gmail.com> To: "Rafael J. Wysocki" , Viresh Kumar , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , FUJITA Tomonori , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Michael Turquette , Stephen Boyd , Breno Leitao , Greg Kroah-Hartman , Luis Chamberlain , Russ Weight , Dave Ertman , Ira Weiny , Leon Romanovsky , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Arnd Bergmann , Brendan Higgins , David Gow , Rae Moar , Jens Axboe , Alexandre Courbot , Alexander Viro , Christian Brauner , Jan Kara , Liam Girdwood , Mark Brown Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, linux-clk@vger.kernel.org, linux-pci@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1758808438; l=3839; i=tamird@gmail.com; h=from:subject:message-id; bh=VECNpd/2fGBh3QJ0YU9rU/w8zx6qBuVEWTaPGNBZjLs=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QFx8Jxi6AjT1YSsescfenvnVsKv/V+CsWmgyG9TWGf4peefBqx8sfDGAJ3fkDpsXNUJgJQ5G9qv 456V5li7HsQM= X-Developer-Key: i=tamird@gmail.com; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc X-Mailman-Approved-At: Mon, 06 Oct 2025 20:57:16 +0000 X-BeenThere: nouveau@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Nouveau development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" C-String literals were added in Rust 1.77. Replace instances of `kernel::c_str!` with C-String literals where possible. Acked-by: Greg Kroah-Hartman Reviewed-by: Alice Ryhl Reviewed-by: Benno Lossin Signed-off-by: Tamir Duberstein --- drivers/block/rnull.rs | 2 +- rust/kernel/sync.rs | 5 ++--- rust/kernel/sync/completion.rs | 2 +- rust/kernel/workqueue.rs | 8 ++++---- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/block/rnull.rs b/drivers/block/rnull.rs index 6366da12c5a5..9aa79b862b63 100644 --- a/drivers/block/rnull.rs +++ b/drivers/block/rnull.rs @@ -55,7 +55,7 @@ fn init(_module: &'static ThisModule) -> impl PinInit { })(); try_pin_init!(Self { - _disk <- new_mutex!(disk?, "nullb:disk"), + _disk <- new_mutex!(disk?, c"nullb:disk"), }) } } diff --git a/rust/kernel/sync.rs b/rust/kernel/sync.rs index 00f9b558a3ad..672411058a92 100644 --- a/rust/kernel/sync.rs +++ b/rust/kernel/sync.rs @@ -44,7 +44,6 @@ impl LockClassKey { /// /// # Examples /// ``` - /// # use kernel::c_str; /// # use kernel::alloc::KBox; /// # use kernel::types::ForeignOwnable; /// # use kernel::sync::{LockClassKey, SpinLock}; @@ -56,7 +55,7 @@ impl LockClassKey { /// { /// stack_pin_init!(let num: SpinLock = SpinLock::new( /// 0, - /// c_str!("my_spinlock"), + /// c"my_spinlock", /// // SAFETY: `key_ptr` is returned by the above `into_foreign()`, whose /// // `from_foreign()` has not yet been called. /// unsafe { > as ForeignOwnable>::borrow(key_ptr) } @@ -115,6 +114,6 @@ macro_rules! optional_name { $crate::c_str!(::core::concat!(::core::file!(), ":", ::core::line!())) }; ($name:literal) => { - $crate::c_str!($name) + $name }; } diff --git a/rust/kernel/sync/completion.rs b/rust/kernel/sync/completion.rs index c50012a940a3..97d39c248793 100644 --- a/rust/kernel/sync/completion.rs +++ b/rust/kernel/sync/completion.rs @@ -34,7 +34,7 @@ /// impl MyTask { /// fn new() -> Result> { /// let this = Arc::pin_init(pin_init!(MyTask { -/// work <- new_work!("MyTask::work"), +/// work <- new_work!(c"MyTask::work"), /// done <- Completion::new(), /// }), GFP_KERNEL)?; /// diff --git a/rust/kernel/workqueue.rs b/rust/kernel/workqueue.rs index b9343d5bc00f..261b827235ae 100644 --- a/rust/kernel/workqueue.rs +++ b/rust/kernel/workqueue.rs @@ -51,7 +51,7 @@ //! fn new(value: i32) -> Result> { //! Arc::pin_init(pin_init!(MyStruct { //! value, -//! work <- new_work!("MyStruct::work"), +//! work <- new_work!(c"MyStruct::work"), //! }), GFP_KERNEL) //! } //! } @@ -98,8 +98,8 @@ //! Arc::pin_init(pin_init!(MyStruct { //! value_1, //! value_2, -//! work_1 <- new_work!("MyStruct::work_1"), -//! work_2 <- new_work!("MyStruct::work_2"), +//! work_1 <- new_work!(c"MyStruct::work_1"), +//! work_2 <- new_work!(c"MyStruct::work_2"), //! }), GFP_KERNEL) //! } //! } @@ -337,7 +337,7 @@ pub fn try_spawn( func: T, ) -> Result<(), AllocError> { let init = pin_init!(ClosureWork { - work <- new_work!("Queue::try_spawn"), + work <- new_work!(c"Queue::try_spawn"), func: Some(func), }); -- 2.51.0