Skip to content

fs/vfs/fs_lock.c: fix behavior according to manual and support SHM #19110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lupyuen merged 2 commits into from
Jun 11, 2026
+17 −12
Merged

fs/vfs/fs_lock.c: fix behavior according to manual and support SHM #19110

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1242a5
fs/vfs/fs_lock.c: fix flock behavior for more threads and fds
michallenc Jun 4, 2026
348b527
fs/vfs/fs_lock.c: support flock for SHM driver
michallenc Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions fs/vfs/fs_lock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,13 @@ static int file_lock_get_path(FAR struct file *filep, FAR char *path)
FAR struct tcb_s *tcb = this_task();
bool is_allowed_type;

/* We only apply file lock on mountpt and driver (f_inode won't be NULL). */
/* We only apply file lock on mountpt, driver or shm
* (f_inode won't be NULL).
*/

is_allowed_type = INODE_IS_MOUNTPT(filep->f_inode) ||
INODE_IS_DRIVER(filep->f_inode);
INODE_IS_DRIVER(filep->f_inode) ||
INODE_IS_SHM(filep->f_inode);

if (!is_allowed_type || tcb->flags & TCB_FLAG_SIGNAL_ACTION)
{
Expand Down Expand Up @@ -260,18 +263,20 @@ static void file_lock_delete_bucket(FAR struct file_lock_bucket_s *bucket,
****************************************************************************/

static bool file_lock_is_conflict(FAR struct flock *request,
FAR struct flock *internal)
FAR struct file *request_filep,
FAR struct file_lock_s *internal)
{
/* If the request is not exactly to the left or right of the internal,
* then there is an overlap.
*/

if (request->l_start <= internal->l_end && request->l_end >=
internal->l_start)
if (request->l_start <= internal->fl_lock.l_end && request->l_end >=
internal->fl_lock.l_start)
{
if (request->l_type == F_WRLCK || internal->l_type == F_WRLCK)
if (request->l_type == F_WRLCK || internal->fl_lock.l_type == F_WRLCK)
{
return request->l_pid != internal->l_pid;
return request->l_pid != internal->fl_lock.l_pid ||
request_filep != internal->fl_file;
}
}

Expand Down Expand Up @@ -371,8 +376,8 @@ static int file_lock_modify(FAR struct file *filep,
{
if (request->l_pid != file_lock->fl_lock.l_pid)
{
/* Only file locks with the same pid need to be processed, so the
* lookup is skipped.
/* Only file locks with the same thread id need to be
* processed, so the lookup is skipped.
*/

if (find)
Expand Down Expand Up @@ -598,7 +603,7 @@ int file_getlk(FAR struct file *filep, FAR struct flock *flock)
list_for_every_entry(&bucket->list, file_lock, struct file_lock_s,
fl_node)
{
if (file_lock_is_conflict(flock, &file_lock->fl_lock))
if (file_lock_is_conflict(flock, filep, file_lock))
{
memcpy(flock, &file_lock->fl_lock, sizeof(*flock));
goto out;
Expand Down Expand Up @@ -677,7 +682,7 @@ int file_setlk(FAR struct file *filep, FAR struct flock *flock,
goto out_free;
}

request.l_pid = getpid();
request.l_pid = gettid();

nxmutex_lock(&g_protect_lock);

Expand Down Expand Up @@ -709,7 +714,7 @@ int file_setlk(FAR struct file *filep, FAR struct flock *flock,
list_for_every_entry(&bucket->list, file_lock, struct file_lock_s,
fl_node)
{
if (file_lock_is_conflict(&request, &file_lock->fl_lock))
if (file_lock_is_conflict(&request, filep, file_lock))
{
if (nonblock)
{
Expand Down
Loading