i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make vfs_resize_fd_table() accessible in the kernel

Browse Source 
Also update some types from int to uint32.
This commit is contained in:
Ingo Weinhold
2014-10-29 21:07:02 +01:00
parent f9f19f0246
commit 6bbd25f071
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/vfs.h
+1
View File
@@ -73,6 +73,7 @@ io_context* vfs_new_io_context(io_context* parentContext,
bool purgeCloseOnExec); bool purgeCloseOnExec);
void vfs_get_io_context(io_context *context); void vfs_get_io_context(io_context *context);
void vfs_put_io_context(io_context *context); void vfs_put_io_context(io_context *context);
status_t vfs_resize_fd_table(struct io_context* context, uint32 newSize);
int vfs_getrlimit(int resource, struct rlimit *rlp); int vfs_getrlimit(int resource, struct rlimit *rlp);
int vfs_setrlimit(int resource, const struct rlimit *rlp); int vfs_setrlimit(int resource, const struct rlimit *rlp);
src/system/kernel/fs/vfs.cpp
+6 -6
View File
@@ -4941,23 +4941,23 @@ vfs_put_io_context(io_context* context)
} }
static status_t status_t
vfs_resize_fd_table(struct io_context* context, const int newSize) vfs_resize_fd_table(struct io_context* context, uint32 newSize)
{ {
if (newSize <= 0 || newSize > MAX_FD_TABLE_SIZE) if (newSize == 0 || newSize > MAX_FD_TABLE_SIZE)
return B_BAD_VALUE; return B_BAD_VALUE;
TIOC(ResizeIOContext(context, newSize)); TIOC(ResizeIOContext(context, newSize));
MutexLocker _(context->io_mutex); MutexLocker _(context->io_mutex);
int oldSize = context->table_size; uint32 oldSize = context->table_size;
int oldCloseOnExitBitmapSize = (oldSize + 7) / 8; int oldCloseOnExitBitmapSize = (oldSize + 7) / 8;
int newCloseOnExitBitmapSize = (newSize + 7) / 8; int newCloseOnExitBitmapSize = (newSize + 7) / 8;
// If the tables shrink, make sure none of the fds being dropped are in use. // If the tables shrink, make sure none of the fds being dropped are in use.
if (newSize < oldSize) { if (newSize < oldSize) {
for (int i = oldSize; i-- > newSize;) { for (uint32 i = oldSize; i-- > newSize;) {
if (context->fds[i]) if (context->fds[i])
return B_BUSY; return B_BUSY;
} }
@@ -4982,7 +4982,7 @@ vfs_resize_fd_table(struct io_context* context, const int newSize)
context->table_size = newSize; context->table_size = newSize;
// copy entries from old tables // copy entries from old tables
int toCopy = min_c(oldSize, newSize); uint32 toCopy = min_c(oldSize, newSize);
memcpy(context->fds, oldFDs, sizeof(void*) * toCopy); memcpy(context->fds, oldFDs, sizeof(void*) * toCopy);
memcpy(context->select_infos, oldSelectInfos, sizeof(void*) * toCopy); memcpy(context->select_infos, oldSelectInfos, sizeof(void*) * toCopy);