diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-04-15 11:57:40 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-04-15 11:57:40 +0200 |
| commit | 8e236f7c5a0c6383e5f604a781e68b1685127e15 (patch) | |
| tree | faf91cbdaa25d71b01e5bfddcfda7bb1d675e7c5 /lib/kernel/src/file_server.erl | |
| parent | f7641c8aafecc7b54b3f6f226892f825ac19f63a (diff) | |
| parent | c82e9fad33302ff24fdddbd50f110c06d4eb81d4 (diff) | |
| download | otp-8e236f7c5a0c6383e5f604a781e68b1685127e15.tar.gz otp-8e236f7c5a0c6383e5f604a781e68b1685127e15.tar.bz2 otp-8e236f7c5a0c6383e5f604a781e68b1685127e15.zip | |
Merge branch 'lh/demonitor-flush/OTP-11039' into maint
* lh/demonitor-flush/OTP-11039:
Use erlang:demonitor(Ref, [flush]) where applicable
Diffstat (limited to 'lib/kernel/src/file_server.erl')
| -rw-r--r-- | lib/kernel/src/file_server.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/kernel/src/file_server.erl b/lib/kernel/src/file_server.erl index 49ec6f96cc..d036dbb516 100644 --- a/lib/kernel/src/file_server.erl +++ b/lib/kernel/src/file_server.erl @@ -317,8 +317,7 @@ do_start_slave(start, Filer, Name) -> SlaveMonitor = erlang:monitor(process, Slave), receive {started, Token} -> - erlang:demonitor(SlaveMonitor), - receive {'DOWN', SlaveMonitor, _, _, _} -> ok after 0 -> ok end, + erlang:demonitor(SlaveMonitor, [flush]), {ok, Slave}; {'DOWN', SlaveMonitor, _, _, Reason} -> exit(Reason) |