Require KernelModule to be Sync

alex · alex · commit 2d4641715024 · 2018-06-17T17:46:27.000Z
diff --git a/src/lib.rs b/src/lib.rs
@@ -66,7 +66,7 @@ macro_rules! kernel_module {
     };
 }
 
-pub trait KernelModule: Sized {
+pub trait KernelModule: Sized + Sync {
     fn init() -> KernelResult<Self>;
 }
 
diff --git a/src/sysctl.rs b/src/sysctl.rs
@@ -15,6 +15,8 @@ pub struct Sysctl<T: SysctlStorage> {
     header: *mut bindings::ctl_table_header,
 }
 
+unsafe impl<T: SysctlStorage> Sync for Sysctl<T> {}
+
 pub trait SysctlStorage: Sync {
     fn store_value(&self, data: &[u8]) -> (usize, error::KernelResult<()>);
     fn read_value(&self, data: &mut UserSlicePtrWriter) -> (usize, error::KernelResult<()>);

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ macro_rules! kernel_module {`
`66`	`66`	`};`
`67`	`67`	`}`
`68`	`68`
`69`		`-pub trait KernelModule: Sized {`
	`69`	`+pub trait KernelModule: Sized + Sync {`
`70`	`70`	`fn init() -> KernelResult<Self>;`
`71`	`71`	`}`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ pub struct Sysctl<T: SysctlStorage> {`
`15`	`15`	`header: *mut bindings::ctl_table_header,`
`16`	`16`	`}`
`17`	`17`
	`18`	`+unsafe impl<T: SysctlStorage> Sync for Sysctl<T> {}`
	`19`	`+`
`18`	`20`	`pub trait SysctlStorage: Sync {`
`19`	`21`	`fn store_value(&self, data: &[u8]) -> (usize, error::KernelResult<()>);`
`20`	`22`	`fn read_value(&self, data: &mut UserSlicePtrWriter) -> (usize, error::KernelResult<()>);`