hrev51971 adds 1 changeset to branch 'master'
old head: 8bca37d604536e5908c5a4ce224ee5afb4ebafc7
new head: 3d5f8b7ccfcca67a94f80130a26ecb64aaccf535
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=3d5f8b7ccfcc+%5E8bca37d60453
----------------------------------------------------------------------------
3d5f8b7ccfcc: protocols/unix: Fix build after previous commit.
[ waddlesplash <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51971
Commit: 3d5f8b7ccfcca67a94f80130a26ecb64aaccf535
URL: https://git.haiku-os.org/haiku/commit/?id=3d5f8b7ccfcc
Author: waddlesplash <waddlesplash@xxxxxxxxx>
Date: Tue May 22 23:46:20 2018 UTC
----------------------------------------------------------------------------
1 file changed, 3 insertions(+), 2 deletions(-)
src/add-ons/kernel/network/protocols/unix/unix.cpp | 5 +++--
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/network/protocols/unix/unix.cpp
b/src/add-ons/kernel/network/protocols/unix/unix.cpp
index 2229736f6b..2198fc76f2 100644
--- a/src/add-ons/kernel/network/protocols/unix/unix.cpp
+++ b/src/add-ons/kernel/network/protocols/unix/unix.cpp
@@ -47,10 +47,11 @@ destroy_scm_rights_descriptors(const ancillary_data_header*
header,
{
int count = header->len / sizeof(file_descriptor*);
file_descriptor** descriptors = (file_descriptor**)data;
+ io_context* ioContext =
get_current_io_context(!gStackModule->is_syscall());
for (int i = 0; i < count; i++) {
if (descriptors[i] != NULL) {
- close_fd(descriptors[i]);
+ close_fd(ioContext, descriptors[i]);
put_fd(descriptors[i]);
}
}
@@ -338,7 +339,7 @@ unix_add_ancillary_data(net_protocol *self,
ancillary_data_container *container,
if (error != B_OK) {
for (int i = 0; i < count; i++) {
if (descriptors[i] != NULL) {
- close_fd(descriptors[i]);
+ close_fd(ioContext, descriptors[i]);
put_fd(descriptors[i]);
}
}
