1544:[refactor] Unnecessary unsafe code

Author: manojks1999

kernel/src/filesystem/vfs/mount.rs

@@ -369,18 +369,11 @@ impl MountFS {
     #[allow(dead_code)]
     #[deprecated]
     fn wrap(self) -> Arc<Self> {
-        // 创建Arc指针
-        let mount_fs: Arc<MountFS> = Arc::new(self);
-        // 创建weak指针
-        let weak: Weak<MountFS> = Arc::downgrade(&mount_fs);
-
-        // 将Arc指针转为Raw指针并对其内部的self_ref字段赋值
-        let ptr: *mut MountFS = mount_fs.as_ref() as *const Self as *mut Self;
-        unsafe {
-            (*ptr).self_ref = weak;
-            // 返回初始化好的MountFS对象
-            return mount_fs;
-        }
+        Arc::new_cyclic(|weak_self| {
+            let mut mount_fs = self;
+            mount_fs.self_ref = weak_self.clone();
+            mount_fs
+        })
     }
 
     /// @brief 获取挂载点的文件系统的root inode
@@ -438,21 +431,11 @@ impl MountFSInode {
     #[allow(dead_code)]
     #[deprecated]
     fn wrap(self) -> Arc<Self> {
-        // 创建Arc指针
-        let inode: Arc<MountFSInode> = Arc::new(self);
-        // 创建Weak指针
-        let weak: Weak<MountFSInode> = Arc::downgrade(&inode);
-        // 将Arc指针转为Raw指针并对其内部的self_ref字段赋值
-        compiler_fence(Ordering::SeqCst);
-        let ptr: *mut MountFSInode = inode.as_ref() as *const Self as *mut Self;
-        compiler_fence(Ordering::SeqCst);
-        unsafe {
-            (*ptr).self_ref = weak;
-            compiler_fence(Ordering::SeqCst);
-
-            // 返回初始化好的MountFSInode对象
-            return inode;
-        }
+        Arc::new_cyclic(|weak_self| {
+            let mut inode = self;
+            inode.self_ref = weak_self.clone();
+            inode
+        })
     }
 
     /// @brief 判断当前inode是否为它所在的文件系统的root inode

kernel/src/process/kthread.rs

@@ -150,23 +150,15 @@ pub enum KernelThreadCreateStatus {
 #[allow(dead_code)]
 impl KernelThreadCreateInfo {
     pub fn new(func: KernelThreadClosure, name: String) -> Arc<Self> {
-        let result = Arc::new(Self {
+        Arc::new_cyclic(|weak_self| Self {
             closure: SpinLock::new(Some(Box::new(func))),
             name,
             created: AtomicKernelThreadCreateStatus::new(KernelThreadCreateStatus::NotCreated),
             result_pcb: SpinLock::new(None),
             has_unsafe_arc_instance: AtomicBool::new(false),
-            self_ref: Weak::new(),
+            self_ref: weak_self.clone(),
             to_mark_sleep: AtomicBool::new(true),
-        });
-        let tmp = result.clone();
-        unsafe {
-            let tmp = Arc::into_raw(tmp) as *mut Self;
-            (*tmp).self_ref = Arc::downgrade(&result);
-            Arc::from_raw(tmp);
-        }
-
-        return result;
+        })
     }
 
     /// 创建者调用这函数，等待创建完成后，获取创建结果