From 43b2ca9108e66fb3f841f2c4fa102f83c6c5e5a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 2 Mar 2009 08:23:16 +0000 Subject: [PATCH] * Fixed wrong use of MutexLocker as pointed out by Korli - nice catch! This could have caused a number of problems. * Fixed coding style violation Ingo introduced. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29378 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/kernel/fs/fd.cpp | 4 ++-- src/system/kernel/fs/vfs.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/system/kernel/fs/fd.cpp b/src/system/kernel/fs/fd.cpp index b554604871..a7b73c40b9 100644 --- a/src/system/kernel/fs/fd.cpp +++ b/src/system/kernel/fs/fd.cpp @@ -297,7 +297,7 @@ get_fd_locked(struct io_context *context, int fd) struct file_descriptor * get_fd(struct io_context *context, int fd) { - MutexLocker(context->io_mutex); + MutexLocker _(context->io_mutex); return get_fd_locked(context, fd); } @@ -306,7 +306,7 @@ get_fd(struct io_context *context, int fd) struct file_descriptor * get_open_fd(struct io_context *context, int fd) { - MutexLocker(context->io_mutex); + MutexLocker _(context->io_mutex); file_descriptor *descriptor = get_fd_locked(context, fd); if (descriptor == NULL) diff --git a/src/system/kernel/fs/vfs.cpp b/src/system/kernel/fs/vfs.cpp index 2b39ef8d29..7255eda1e9 100644 --- a/src/system/kernel/fs/vfs.cpp +++ b/src/system/kernel/fs/vfs.cpp @@ -4744,13 +4744,15 @@ vfs_free_io_context(io_context* context) } -void vfs_get_io_context(io_context *context) +void +vfs_get_io_context(io_context* context) { atomic_add(&context->ref_count, 1); } -void vfs_put_io_context(io_context *context) +void +vfs_put_io_context(io_context* context) { if (atomic_add(&context->ref_count, -1) == 1) vfs_free_io_context(context);