From: Andreas Hindborg <a.hindborg@kernel.org>
To: "Boqun Feng" <boqun.feng@gmail.com>,
"Miguel Ojeda" <ojeda@kernel.org>,
"Alex Gaynor" <alex.gaynor@gmail.com>,
"Gary Guo" <gary@garyguo.net>,
"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
"Benno Lossin" <lossin@kernel.org>,
"Alice Ryhl" <aliceryhl@google.com>,
"Trevor Gross" <tmgross@umich.edu>,
"Danilo Krummrich" <dakr@kernel.org>,
"Jens Axboe" <axboe@kernel.dk>,
"Breno Leitao" <leitao@debian.org>
Cc: linux-block@vger.kernel.org, rust-for-linux@vger.kernel.org,
linux-kernel@vger.kernel.org,
Andreas Hindborg <a.hindborg@kernel.org>,
Daniel Almeida <daniel.almeida@collabora.com>
Subject: [PATCH v7 09/17] rust: block: remove `RawWriter`
Date: Tue, 02 Sep 2025 11:55:03 +0200 [thread overview]
Message-ID: <20250902-rnull-up-v6-16-v7-9-b5212cc89b98@kernel.org> (raw)
In-Reply-To: <20250902-rnull-up-v6-16-v7-0-b5212cc89b98@kernel.org>
`RawWriter` is now dead code, so remove it.
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Reviewed-by: Daniel Almeida <daniel.almeida@collabora.com>
Signed-off-by: Andreas Hindborg <a.hindborg@kernel.org>
---
rust/kernel/block/mq.rs | 1 -
rust/kernel/block/mq/raw_writer.rs | 56 --------------------------------------
2 files changed, 57 deletions(-)
diff --git a/rust/kernel/block/mq.rs b/rust/kernel/block/mq.rs
index 831445d37181..98fa0d6bc8f7 100644
--- a/rust/kernel/block/mq.rs
+++ b/rust/kernel/block/mq.rs
@@ -89,7 +89,6 @@
pub mod gen_disk;
mod operations;
-mod raw_writer;
mod request;
mod tag_set;
diff --git a/rust/kernel/block/mq/raw_writer.rs b/rust/kernel/block/mq/raw_writer.rs
deleted file mode 100644
index 0aef55703e71..000000000000
--- a/rust/kernel/block/mq/raw_writer.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-use core::fmt::{self, Write};
-
-use crate::error::Result;
-use crate::prelude::EINVAL;
-
-/// A mutable reference to a byte buffer where a string can be written into.
-///
-/// # Invariants
-///
-/// `buffer` is always null terminated.
-pub(crate) struct RawWriter<'a> {
- buffer: &'a mut [u8],
- pos: usize,
-}
-
-impl<'a> RawWriter<'a> {
- /// Create a new `RawWriter` instance.
- fn new(buffer: &'a mut [u8]) -> Result<RawWriter<'a>> {
- *(buffer.last_mut().ok_or(EINVAL)?) = 0;
-
- // INVARIANT: We null terminated the buffer above.
- Ok(Self { buffer, pos: 0 })
- }
-
- #[expect(dead_code)]
- pub(crate) fn from_array<const N: usize>(
- a: &'a mut [crate::ffi::c_char; N],
- ) -> Result<RawWriter<'a>> {
- Self::new(
- // SAFETY: the buffer of `a` is valid for read and write as `u8` for
- // at least `N` bytes.
- unsafe { core::slice::from_raw_parts_mut(a.as_mut_ptr().cast::<u8>(), N) },
- )
- }
-}
-
-impl Write for RawWriter<'_> {
- fn write_str(&mut self, s: &str) -> fmt::Result {
- let bytes = s.as_bytes();
- let len = bytes.len();
-
- // We do not want to overwrite our null terminator
- if self.pos + len > self.buffer.len() - 1 {
- return Err(fmt::Error);
- }
-
- // INVARIANT: We are not overwriting the last byte
- self.buffer[self.pos..self.pos + len].copy_from_slice(bytes);
-
- self.pos += len;
-
- Ok(())
- }
-}
--
2.47.2
next prev parent reply other threads:[~2025-09-02 9:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-02 9:54 [PATCH v7 00/17] rnull: add configfs, remote completion to rnull Andreas Hindborg
2025-09-02 9:54 ` [PATCH v7 01/17] rust: str: normalize imports in `str.rs` Andreas Hindborg
2025-09-02 9:54 ` [PATCH v7 02/17] rust: str: allow `str::Formatter` to format into `&mut [u8]` Andreas Hindborg
2025-09-02 9:54 ` [PATCH v7 03/17] rust: str: expose `str::{Formatter, RawFormatter}` publicly Andreas Hindborg
2025-09-02 9:54 ` [PATCH v7 04/17] rust: str: introduce `NullTerminatedFormatter` Andreas Hindborg
2025-09-02 9:54 ` [PATCH v7 05/17] rust: str: introduce `kstrtobool` function Andreas Hindborg
2025-09-02 11:05 ` Alice Ryhl
2025-09-02 9:55 ` [PATCH v7 06/17] rust: configfs: re-export `configfs_attrs` from `configfs` module Andreas Hindborg
2025-09-02 9:55 ` [PATCH v7 07/17] rust: block: normalize imports for `gen_disk.rs` Andreas Hindborg
2025-09-02 9:55 ` [PATCH v7 08/17] rust: block: use `NullTerminatedFormatter` Andreas Hindborg
2025-09-02 9:55 ` Andreas Hindborg [this message]
2025-09-02 9:55 ` [PATCH v7 10/17] rust: block: remove trait bound from `mq::Request` definition Andreas Hindborg
2025-09-02 9:55 ` [PATCH v7 11/17] rust: block: add block related constants Andreas Hindborg
2025-09-02 9:55 ` [PATCH v7 12/17] rnull: move driver to separate directory Andreas Hindborg
2025-09-02 9:55 ` [PATCH v7 13/17] rnull: enable configuration via `configfs` Andreas Hindborg
2025-09-02 9:55 ` [PATCH v7 14/17] rust: block: add `GenDisk` private data support Andreas Hindborg
2025-09-02 9:55 ` [PATCH v7 15/17] rust: block: mq: fix spelling in a safety comment Andreas Hindborg
2025-09-02 9:55 ` [PATCH v7 16/17] rust: block: add remote completion to `Request` Andreas Hindborg
2025-09-02 9:55 ` [PATCH v7 17/17] rnull: add soft-irq completion support Andreas Hindborg
2025-09-02 19:40 ` [PATCH v7 00/17] rnull: add configfs, remote completion to rnull Daniel Almeida
2025-09-02 22:22 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250902-rnull-up-v6-16-v7-9-b5212cc89b98@kernel.org \
--to=a.hindborg@kernel.org \
--cc=alex.gaynor@gmail.com \
--cc=aliceryhl@google.com \
--cc=axboe@kernel.dk \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=dakr@kernel.org \
--cc=daniel.almeida@collabora.com \
--cc=gary@garyguo.net \
--cc=leitao@debian.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lossin@kernel.org \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=tmgross@umich.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).