Merge branch 'maint'

6 files changed, 13 insertions, 47 deletions

diff --git a/lib/kernel/src/application_master.erl b/lib/kernel/src/application_master.erl
index 679fefaed9..34a3efcaf2 100644
--- a/lib/kernel/src/application_master.erl
+++ b/lib/kernel/src/application_master.erl
@@ -76,13 +76,8 @@ call(AppMaster, Req) ->
 	{'DOWN', Ref, process, _, _Info} ->
 	    ok;
 	{Tag, Res} ->
-	    erlang:demonitor(Ref),
-	    receive 
-		{'DOWN', Ref, process, _, _Info} -> 
-		    Res
-	    after 0 ->
-		    Res
-	    end
+	    erlang:demonitor(Ref, [flush]),
+	    Res
     end.
 
 %%%-----------------------------------------------------------------
diff --git a/lib/kernel/src/disk_log.erl b/lib/kernel/src/disk_log.erl
index 0c5af2857e..c238eff12f 100644
--- a/lib/kernel/src/disk_log.erl
+++ b/lib/kernel/src/disk_log.erl
@@ -1914,13 +1914,8 @@ multi_req(Msg, Pids) ->
 			    {'DOWN', Ref, process, Pid, _Info} ->
 				Reply;
 			    {disk_log, Pid, _Reply} ->
-				erlang:demonitor(Ref),
-				receive 
-				    {'DOWN', Ref, process, Pid, _Reason} ->
-					ok
-				after 0 -> 
-					ok
-				end
+				erlang:demonitor(Ref, [flush]),
+				ok
 			end
 		end, {error, nonode}, Refs).
 
@@ -1965,13 +1960,8 @@ monitor_request(Pid, Req) ->
 	    {error, no_such_log};
 	{disk_log, Pid, Reply} when not is_tuple(Reply) orelse
                                     element(2, Reply) =/= disk_log_stopped ->
-	    erlang:demonitor(Ref),
-	    receive 
-		{'DOWN', Ref, process, Pid, _Reason} ->
-		    Reply
-	    after 0 ->
-                    Reply
-	    end
+	    erlang:demonitor(Ref, [flush]),
+	    Reply
     end.
 
 req2(Pid, R) ->
diff --git a/lib/kernel/src/file_io_server.erl b/lib/kernel/src/file_io_server.erl
index fad2ed7fb3..07fb55f390 100644
--- a/lib/kernel/src/file_io_server.erl
+++ b/lib/kernel/src/file_io_server.erl
@@ -92,8 +92,7 @@ do_start(Spawn, Owner, FileName, ModeList) ->
     Mref = erlang:monitor(process, Pid),
     receive
 	{Ref, {error, _Reason} = Error} ->
-	    erlang:demonitor(Mref),
-	    receive {'DOWN', Mref, _, _, _} -> ok after 0 -> ok end,
+	    erlang:demonitor(Mref, [flush]),
 	    Error;
 	{Ref, ok} ->
 	    erlang:demonitor(Mref),
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)
diff --git a/lib/kernel/src/inet_gethost_native.erl b/lib/kernel/src/inet_gethost_native.erl
index db3e44ce6f..df866660b4 100644
--- a/lib/kernel/src/inet_gethost_native.erl
+++ b/lib/kernel/src/inet_gethost_native.erl
@@ -503,8 +503,7 @@ getit(Req, DefaultName) ->
 			Pid, Reason} ->
 			   {error, Reason}
 		   end,
-	    catch erlang:demonitor(Ref2),
-	    receive {'DOWN',Ref2,_,_,_} -> ok after 0 -> ok end,
+	    catch erlang:demonitor(Ref2, [flush]),
 	    Res2
     end.
 
diff --git a/lib/kernel/src/rpc.erl b/lib/kernel/src/rpc.erl
index 7c965ca384..83e0b59cc2 100644
--- a/lib/kernel/src/rpc.erl
+++ b/lib/kernel/src/rpc.erl
@@ -388,13 +388,8 @@ server_call(Node, Name, ReplyWrapper, Msg)
 		{'DOWN', Ref, _, _, _} ->
 		    {error, nodedown};
 		{ReplyWrapper, Node, Reply} ->
-		    erlang:demonitor(Ref),
-		    receive
-			{'DOWN', Ref, _, _, _} ->
-			    Reply
-		    after 0 ->
-			    Reply
-		    end
+		    erlang:demonitor(Ref, [flush]),
+		    Reply
 	    end
     end.
 
@@ -501,17 +496,6 @@ start_monitor(Node, Name) ->
 	    {Node,erlang:monitor(process, {Name, Node})}
     end.
 
-%% Cancels a monitor started with Ref=erlang:monitor(_, _),
-%% i.e return value {Node, Ref} from start_monitor/2 above.
-unmonitor(Ref) when is_reference(Ref) ->
-    erlang:demonitor(Ref),
-    receive
-	{'DOWN', Ref, _, _, _} ->
-	    true
-    after 0 ->
-	    true
-    end.
-
 
 %% Call apply(M,F,A) on all nodes in parallel
 -spec multicall(Module, Function, Args) -> {ResL, BadNodes} when
@@ -635,10 +619,10 @@ rec_nodes(Name, [{N,R} | Tail], Badnodes, Replies) ->
 	    rec_nodes(Name, Tail, [N|Badnodes], Replies);
 	{?NAME, N, {nonexisting_name, _}} ->  
 	    %% used by sbcast()
-	    unmonitor(R),
+	    erlang:demonitor(R, [flush]),
 	    rec_nodes(Name, Tail, [N|Badnodes], Replies);
 	{Name, N, Reply} ->  %% Name is bound !!!
-	    unmonitor(R),
+	    erlang:demonitor(R, [flush]),
 	    rec_nodes(Name, Tail, Badnodes, [Reply|Replies])
     end.