Commit c7e20faa authored by Asahi Lina's avatar Asahi Lina Committed by Miguel Ojeda
Browse files

rust: error: Add Error::to_ptr() 



This is the Rust equivalent to ERR_PTR(), for use in C callbacks.
Marked as #[allow(dead_code)] for now, since it does not have any
consumers yet.

Reviewed-by: default avatarMartin Rodriguez Reboredo <yakoyoku@gmail.com>
Signed-off-by: default avatarAsahi Lina <lina@asahilina.net>
Reviewed-by: default avatarGary Guo <gary@garyguo.net>
Link: https://lore.kernel.org/r/20230224-rust-error-v3-2-03779bddc02b@asahilina.net


Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
parent 46384d09

rust/helpers.c

+7 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include <linux/bug.h>

#include <linux/build_bug.h>

#include <linux/err.h>

#include <linux/refcount.h>



__noreturn void rust_helper_BUG(void)
@@ -46,6 +47,12 @@ bool rust_helper_refcount_dec_and_test(refcount_t *r) 
}

EXPORT_SYMBOL_GPL(rust_helper_refcount_dec_and_test);



__force void *rust_helper_ERR_PTR(long err)

{

	return ERR_PTR(err);

}

EXPORT_SYMBOL_GPL(rust_helper_ERR_PTR);



/*

 * We use `bindgen`'s `--size_t-is-usize` option to bind the C `size_t` type

 * as the Rust `usize` type, so we can use it in contexts where Rust

rust/kernel/error.rs

+7 −0
Original line number Diff line number Diff line
@@ -76,6 +76,13 @@ impl Error { 
    pub fn to_errno(self) -> core::ffi::c_int {

        self.0

    }



    /// Returns the error encoded as a pointer.

    #[allow(dead_code)]

    pub(crate) fn to_ptr<T>(self) -> *mut T {

        // SAFETY: self.0 is a valid error due to its invariant.

        unsafe { bindings::ERR_PTR(self.0.into()) as *mut _ }

    }

}



impl From<AllocError> for Error {