Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed broken handling of the new file_descriptor::open_count across

Browse Source 
team boundaries; if you didn't actually call close() from within the
application, the close-hook of the file system was never called.
Also, you could close files of other teams (ie. invoke close on a
shared file descriptor).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@11892 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2005-03-18 01:24:11 +00:00
parent 6d92b10268
commit 9391dd214d
4 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
headers/private/kernel/fd.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de. * Copyright 2002-2005, Axel Dörfler, axeld@pinc-software.de.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
#ifndef _FD_H #ifndef _FD_H
@ -68,8 +68,8 @@ extern struct file_descriptor *alloc_fd(void);
extern int new_fd_etc(struct io_context *, struct file_descriptor *, int firstIndex); extern int new_fd_etc(struct io_context *, struct file_descriptor *, int firstIndex);
extern int new_fd(struct io_context *, struct file_descriptor *); extern int new_fd(struct io_context *, struct file_descriptor *);
extern struct file_descriptor *get_fd(struct io_context *, int); extern struct file_descriptor *get_fd(struct io_context *, int);
extern void put_fd(struct file_descriptor *); extern void close_fd(struct file_descriptor *descriptor);
extern void free_fd(struct file_descriptor *); extern void put_fd(struct file_descriptor *descriptor);
extern status_t select_fd(int fd, uint8 event, uint32 ref, struct select_sync *sync, bool kernel); extern status_t select_fd(int fd, uint8 event, uint32 ref, struct select_sync *sync, bool kernel);
extern status_t deselect_fd(int fd, uint8 event, struct select_sync *sync, bool kernel); extern status_t deselect_fd(int fd, uint8 event, struct select_sync *sync, bool kernel);
extern bool fd_is_valid(int fd, bool kernel); extern bool fd_is_valid(int fd, bool kernel);

2
headers/private/kernel/vfs.h
View File

@ -58,7 +58,7 @@ status_t vfs_bootstrap_file_systems(void);
status_t vfs_mount_boot_file_system(struct kernel_args *args); status_t vfs_mount_boot_file_system(struct kernel_args *args);
void vfs_exec_io_context(void *context); void vfs_exec_io_context(void *context);
void *vfs_new_io_context(void *parentContext); void *vfs_new_io_context(void *parentContext);
int vfs_free_io_context(void *context); status_t vfs_free_io_context(void *context);
struct rlimit; struct rlimit;
int vfs_getrlimit(int resource, struct rlimit * rlp); int vfs_getrlimit(int resource, struct rlimit * rlp);

18
src/kernel/core/fs/fd.c
View File

@ -1,6 +1,6 @@
/* Operations on file descriptors /* Operations on file descriptors
* *
* Copyright 2002-2004, Axel Dörfler, axeld@pinc-software.de. * Copyright 2002-2005, Axel Dörfler, axeld@pinc-software.de.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
@ -118,6 +118,16 @@ put_fd(struct file_descriptor *descriptor)
} }
void
close_fd(struct file_descriptor *descriptor)
{
if (atomic_add(&descriptor->open_count, -1) == 1) {
if (descriptor->ops->fd_close)
descriptor->ops->fd_close(descriptor);
}
}
struct file_descriptor * struct file_descriptor *
get_fd(struct io_context *context, int fd) get_fd(struct io_context *context, int fd)
{ {
@ -313,11 +323,7 @@ common_close(int fd, bool kernel)
TRACE(("_user_close(descriptor = %p)\n", descriptor)); TRACE(("_user_close(descriptor = %p)\n", descriptor));
#endif #endif
if (atomic_add(&descriptor->open_count, -1) == 1) { close_fd(descriptor);
if (descriptor->ops->fd_close)
descriptor->ops->fd_close(descriptor);
}
put_fd(descriptor); put_fd(descriptor);
// the reference associated with the slot // the reference associated with the slot

21
src/kernel/core/fs/vfs.cpp
View File

@ -2531,9 +2531,12 @@ vfs_new_io_context(void *_parentContext)
inc_vnode_ref_count(context->cwd); inc_vnode_ref_count(context->cwd);
for (i = 0; i < tableSize; i++) { for (i = 0; i < tableSize; i++) {
if (parentContext->fds[i] && (parentContext->fds[i]->open_mode & O_CLOEXEC) == 0) { struct file_descriptor *descriptor = parentContext->fds[i];
context->fds[i] = parentContext->fds[i];
atomic_add(&context->fds[i]->ref_count, 1); if (descriptor != NULL && (descriptor->open_mode & O_CLOEXEC) == 0) {
context->fds[i] = descriptor;
atomic_add(&descriptor->ref_count, 1);
atomic_add(&descriptor->open_count, 1);
} }
} }
@ -2554,7 +2557,7 @@ vfs_new_io_context(void *_parentContext)
} }
int status_t
vfs_free_io_context(void *_ioContext) vfs_free_io_context(void *_ioContext)
{ {
struct io_context *context = (struct io_context *)_ioContext; struct io_context *context = (struct io_context *)_ioContext;
@ -2566,8 +2569,10 @@ vfs_free_io_context(void *_ioContext)
mutex_lock(&context->io_mutex); mutex_lock(&context->io_mutex);
for (i = 0; i < context->table_size; i++) { for (i = 0; i < context->table_size; i++) {
if (context->fds[i]) if (struct file_descriptor *descriptor = context->fds[i]) {
put_fd(context->fds[i]); close_fd(descriptor);
put_fd(descriptor);
}
} }
mutex_unlock(&context->io_mutex); mutex_unlock(&context->io_mutex);
@ -2578,11 +2583,11 @@ vfs_free_io_context(void *_ioContext)
free(context->fds); free(context->fds);
free(context); free(context);
return 0; return B_OK;
} }
static int static status_t
vfs_resize_fd_table(struct io_context *context, const int newSize) vfs_resize_fd_table(struct io_context *context, const int newSize)
{ {
void *fds; void *fds;