@@ -19,6 +19,7 @@ use kernel::{
1919 io_buffer:: { IoBufferReader , IoBufferWriter } ,
2020 miscdev, new_mutex, pin_init,
2121 sync:: { Arc , ArcBorrow , Mutex } ,
22+ types:: Opaque ,
2223} ;
2324
2425module ! {
@@ -29,22 +30,11 @@ module! {
2930 license: "GPL" ,
3031}
3132
32- // Fist I made CompletionDev { completion: bindings::completion }.
33- // But it didn't work because we cannot get mutable reference to CompletionDev in read/write functions.
34- // The argument of read/write functions is ArcBorrow<'_, CompletionDev>.
35- // So it's not allowed to get the mutable reference to CompletionDev.
36- // The only way to mutate through ArcBorrow is to use Mutex/RwLock/Atomic types.
37- // (see doc.rust-lang.org/std/sync/struct.Mutex.html)
38- // Finally I makde CompletionInner struct and put it into Mutex.
39- struct CompletionInner {
40- completion : bindings:: completion ,
41- }
42-
4333// internal info between file operations
4434#[ pin_data]
4535struct CompletionDev {
4636 #[ pin]
47- inner : Mutex < CompletionInner > ,
37+ completion : Opaque < bindings :: completion > ,
4838}
4939
5040// TODO: impl CompletionDev::try_new
@@ -63,17 +53,11 @@ impl CompletionDev {
6353 let mut key: bindings:: lock_class_key = bindings:: lock_class_key:: default ( ) ;
6454 compl. done = 0 ;
6555 unsafe {
66- bindings:: __init_swait_queue_head (
67- & mut compl. wait ,
68- compl_name. as_char_ptr ( ) as * mut core:: ffi:: c_char ,
69- & mut key,
70- ) ;
56+ bindings:: __init_swait_queue_head ( & mut compl. wait , compl_name. as_char_ptr ( ) , & mut key) ;
7157 }
7258
7359 let dev = Arc :: pin_init ( pin_init ! ( Self {
74- inner <- new_mutex!( CompletionInner {
75- completion: compl,
76- } ) ,
60+ completion: Opaque :: new( compl) ,
7761 } ) ) ?;
7862
7963 Ok ( dev)
@@ -105,9 +89,8 @@ impl file::Operations for RustFile {
10589 ) -> Result < usize > {
10690 pr_info ! ( "read is invoked\n " ) ;
10791
108- let mut inner_guard = shared. inner . lock ( ) ;
10992 unsafe {
110- bindings:: wait_for_completion ( & mut inner_guard . completion ) ;
93+ bindings:: wait_for_completion ( Opaque :: raw_get ( & shared . completion ) ) ;
11194 }
11295
11396 Ok ( 0 )
@@ -121,9 +104,8 @@ impl file::Operations for RustFile {
121104 ) -> Result < usize > {
122105 pr_info ! ( "write is invoked\n " ) ;
123106
124- let mut inner_guard = shared. inner . lock ( ) ;
125107 unsafe {
126- bindings:: complete ( & mut inner_guard . completion ) ;
108+ bindings:: complete ( Opaque :: raw_get ( & shared . completion ) ) ;
127109 }
128110
129111 // return non-zero value to avoid infinite re-try
0 commit comments