qiurui
/
asterinas
mirror of https://github.com/asterinas/asterinas.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix overflow behavior and control flags

This commit is contained in:
Ruihan Li 2026-01-05 16:07:55 +08:00 committed by Tate, Hongliang Tian
parent e082d4eaa6
commit bdc1c79770
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
book/src/kernel/linux-compatibility/syscall-flag-coverage/file-systems-and-mount-control/inotify_add_watch.scml
View File

@ -3,7 +3,7 @@ inotify_events = IN_ACCESS | IN_MODIFY | IN_ATTRIB | IN_CLOSE_WRITE |
IN_DELETE_SELF | IN_CLOSE; IN_DELETE_SELF | IN_CLOSE;
inotify_controls = IN_ONLYDIR | IN_DONT_FOLLOW | IN_MASK_CREATE | inotify_controls = IN_ONLYDIR | IN_DONT_FOLLOW | IN_MASK_CREATE |
IN_MASK_ADD | IN_ISDIR | IN_ONESHOT; IN_MASK_ADD | IN_ONESHOT;
// Add a watch to an initialized inotify instance // Add a watch to an initialized inotify instance
inotify_add_watch(fd, pathname, mask = <inotify_events> | <inotify_controls>); inotify_add_watch(fd, pathname, mask = <inotify_events> | <inotify_controls>);

9
kernel/src/fs/notify/inotify.rs
View File

@ -239,8 +239,12 @@ impl InotifyFile {
} }
// If the queue is full, drop the event. // If the queue is full, drop the event.
// We do not return an error to the caller. // Try to queue an overflow event in advance to alert the user.
if event_queue.len() >= self.queue_capacity { if event_queue.len() == self.queue_capacity - 1 {
let overflow_event = InotifyEvent::new(u32::MAX, FsEvents::Q_OVERFLOW, 0, None);
event_queue.push_back(overflow_event);
return;
} else if event_queue.len() >= self.queue_capacity {
return; return;
} }
@ -672,7 +676,6 @@ bitflags! {
const EXCL_UNLINK = 1 << 26; // Exclude events on unlinked objects const EXCL_UNLINK = 1 << 26; // Exclude events on unlinked objects
const MASK_CREATE = 1 << 28; // Only create watches const MASK_CREATE = 1 << 28; // Only create watches
const MASK_ADD = 1 << 29; // Add to existing watch mask const MASK_ADD = 1 << 29; // Add to existing watch mask
const ISDIR = 1 << 30; // Event occurred on a directory
const ONESHOT = 1 << 31; // Send event once const ONESHOT = 1 << 31; // Send event once
} }
} }