Bananymous/banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: Move UTIME_OMIT handling to the syscall from inode

Browse Source
This commit is contained in:
Bananymous
2026-05-19 11:53:14 +03:00
parent deb2f52a35
commit a05fcdde8c
3 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
kernel/kernel/FS/Ext2/Inode.cpp
View File

@@ -390,20 +390,18 @@ namespace Kernel
{ {
RWLockWRGuard _(m_lock); RWLockWRGuard _(m_lock);
const uint32_t old_times[2] { const timespec old_times[2] {
static_cast<uint32_t>(m_atime.tv_sec), m_atime,
static_cast<uint32_t>(m_mtime.tv_sec), m_mtime,
}; };
if (times[0].tv_nsec != UTIME_OMIT) m_atime = times[0];
m_atime.tv_sec = times[0].tv_sec; m_mtime = times[1];
if (times[1].tv_nsec != UTIME_OMIT)
m_mtime.tv_sec = times[1].tv_sec;
if (auto ret = sync_no_lock(); ret.is_error()) if (auto ret = sync_no_lock(); ret.is_error())
{ {
m_atime.tv_sec = old_times[0]; m_atime = old_times[0];
m_mtime.tv_sec = old_times[1]; m_mtime = old_times[1];
return ret.release_error(); return ret.release_error();
} }

4
kernel/kernel/FS/TmpFS/Inode.cpp
View File

@@ -119,10 +119,8 @@ namespace Kernel
BAN::ErrorOr<void> TmpInode::utimens_impl(const timespec times[2]) BAN::ErrorOr<void> TmpInode::utimens_impl(const timespec times[2])
{ {
// FIXME: make this atomic // FIXME: make this atomic
if (times[0].tv_nsec != UTIME_OMIT)
m_atime = times[0]; m_atime = times[0];
if (times[1].tv_nsec != UTIME_OMIT) m_mtime = times[1];
m_atime = times[1];
return {}; return {};
} }

12
kernel/kernel/Process.cpp
View File

@@ -1535,11 +1535,7 @@ namespace Kernel
if (flag == AT_SYMLINK_NOFOLLOW) if (flag == AT_SYMLINK_NOFOLLOW)
flag = O_NOFOLLOW; flag = O_NOFOLLOW;
const uint64_t current_ns = SystemTimer::get().ns_since_boot(); const timespec current_ts = SystemTimer::get().real_time();
const timespec current_ts = {
.tv_sec = static_cast<time_t>(current_ns / 1'000'000),
.tv_nsec = static_cast<long>(current_ns % 1'000'000),
};
timespec times[2]; timespec times[2];
if (user_times == nullptr) if (user_times == nullptr)
@@ -1560,7 +1556,6 @@ namespace Kernel
else if (times[i].tv_nsec < 0 || times[i].tv_nsec >= 1'000'000'000) else if (times[i].tv_nsec < 0 || times[i].tv_nsec >= 1'000'000'000)
return BAN::Error::from_errno(EINVAL); return BAN::Error::from_errno(EINVAL);
} }
} }
if (times[0].tv_nsec == UTIME_OMIT && times[1].tv_nsec == UTIME_OMIT) if (times[0].tv_nsec == UTIME_OMIT && times[1].tv_nsec == UTIME_OMIT)
@@ -1581,6 +1576,11 @@ namespace Kernel
} }
} }
if (times[0].tv_nsec == UTIME_OMIT)
times[0] = inode->atime();
if (times[1].tv_nsec == UTIME_OMIT)
times[1] = inode->mtime();
TRY(inode->utimens(times)); TRY(inode->utimens(times));
return 0; return 0;