DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-12 18:26:50 +00:00
Code Issues Releases Wiki Activity

修正文件open和写入的错误 (#429)

Browse Source 
1. 修正文件open的时候可能错误的把inode清空的问题(如果当前inode是mknod创建的)
2. 修正fat和block device中,对文件写入部分的错误问题
This commit is contained in:
LoGin 2023-11-09 00:10:34 +08:00 committed by GitHub
parent 04babc3fab
commit 0facf623d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/src/driver/base/block/block_device.rs
View File

@ -261,7 +261,7 @@ pub trait BlockDevice: Device {
let mut temp = Vec::new(); let mut temp = Vec::new();
temp.resize(1usize << self.blk_size_log2(), 0); temp.resize(1usize << self.blk_size_log2(), 0);
// 由于块设备每次读写都是整块的，在不完整写入之前，必须把不完整的地方补全 // 由于块设备每次读写都是整块的，在不完整写入之前，必须把不完整的地方补全
self.write_at(range.lba_start, 1, &mut temp[..])?; self.read_at(range.lba_start, 1, &mut temp[..])?;
// 把数据从临时buffer复制到目标buffer // 把数据从临时buffer复制到目标buffer
temp[range.begin..range.end].copy_from_slice(&buf_slice); temp[range.begin..range.end].copy_from_slice(&buf_slice);
self.write_at(range.lba_start, 1, &temp[..])?; self.write_at(range.lba_start, 1, &temp[..])?;

2
kernel/src/filesystem/fat/entry.rs
View File

@ -198,7 +198,7 @@ impl FATFile {
// 计算本次写入位置在磁盘上的偏移量 // 计算本次写入位置在磁盘上的偏移量
let offset = fs.cluster_bytes_offset(current_cluster) + in_cluster_bytes_offset; let offset = fs.cluster_bytes_offset(current_cluster) + in_cluster_bytes_offset;
// 写入磁盘 // 写入磁盘
let w: usize = fs.partition.disk().write_at( let w: usize = fs.partition.disk().write_at_bytes(
offset as usize, offset as usize,
end_len, end_len,
&buf[start..start + end_len], &buf[start..start + end_len],

16
kernel/src/filesystem/vfs/syscall.rs
View File

@ -191,14 +191,6 @@ impl Syscall {
return Err(SystemError::ENOTDIR); return Err(SystemError::ENOTDIR);
} }
// 如果O_TRUNC，并且，打开模式包含O_RDWR或O_WRONLY，清空文件
if mode.contains(FileMode::O_TRUNC)
&& (mode.contains(FileMode::O_RDWR) || mode.contains(FileMode::O_WRONLY))
&& file_type == FileType::File
{
inode.truncate(0)?;
}
// 创建文件对象 // 创建文件对象
let mut file: File = File::new(inode, mode)?; let mut file: File = File::new(inode, mode)?;
@ -207,6 +199,14 @@ impl Syscall {
if mode.contains(FileMode::O_APPEND) { if mode.contains(FileMode::O_APPEND) {
file.lseek(SeekFrom::SeekEnd(0))?; file.lseek(SeekFrom::SeekEnd(0))?;
} }
// 如果O_TRUNC，并且，打开模式包含O_RDWR或O_WRONLY，清空文件
if mode.contains(FileMode::O_TRUNC)
&& (mode.contains(FileMode::O_RDWR) || mode.contains(FileMode::O_WRONLY))
&& file_type == FileType::File
{
file.ftruncate(0)?;
}
// 把文件对象存入pcb // 把文件对象存入pcb
let r = ProcessManager::current_pcb() let r = ProcessManager::current_pcb()
.fd_table() .fd_table()