From db4ddca4d9709965121fba9a1f9cc68226f35a0c Mon Sep 17 00:00:00 2001
From: Patrik Nyblom <pan@erlang.org>
Date: Mon, 5 Mar 2012 17:29:03 +0100
Subject: Correct some errors in the user tag spreading

---
 lib/dtrace/examples/user-probe.systemtap |  4 ++--
 lib/kernel/src/file.erl                  | 11 ++++++-----
 lib/kernel/src/file_io_server.erl        |  3 +++
 3 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/dtrace/examples/user-probe.systemtap b/lib/dtrace/examples/user-probe.systemtap
index c80bf94697..84a45709e8 100644
--- a/lib/dtrace/examples/user-probe.systemtap
+++ b/lib/dtrace/examples/user-probe.systemtap
@@ -28,12 +28,12 @@
  *       environment.
  */
 
-probe process("dtrace.so").mark("user_trace-s1")
+probe process("dyntrace.so").mark("user_trace-s1")
 {
     printf("%s\n", user_string($arg1));
 }
 
-probe process("dtrace.so").mark("user_trace-i4s4")
+probe process("dyntrace.so").mark("user_trace-i4s4")
 {
     printf("%s %s %d %d %d %d '%s' '%s' '%s' '%s'\n",
            user_string($arg1),
diff --git a/lib/kernel/src/file.erl b/lib/kernel/src/file.erl
index 3a618976f5..b281151778 100644
--- a/lib/kernel/src/file.erl
+++ b/lib/kernel/src/file.erl
@@ -1416,15 +1416,16 @@ mode_list(_) ->
 %% Functions for communicating with the file server
 
 call(Command, Args) when is_list(Args) ->
-    gen_server:call(?FILE_SERVER, list_to_tuple([Command | Args]), infinity).
+    X = erlang:spread_utag(true),
+    Y = gen_server:call(?FILE_SERVER, list_to_tuple([Command | Args]), 
+			infinity),
+    erlang:restore_utag(X),
+    Y.
 
 check_and_call(Command, Args) when is_list(Args) ->
     case check_args(Args) of
 	ok ->
-	    X = erlang:spread_utag(true),
-	    Y = call(Command, Args),
-	    erlang:restore_utag(X),
-	    Y;
+	    call(Command, Args);
 	Error ->
 	    Error
     end.
diff --git a/lib/kernel/src/file_io_server.erl b/lib/kernel/src/file_io_server.erl
index 14da9c1a55..6369a5250c 100644
--- a/lib/kernel/src/file_io_server.erl
+++ b/lib/kernel/src/file_io_server.erl
@@ -57,9 +57,11 @@ start_link(Owner, FileName, ModeList)
 do_start(Spawn, Owner, FileName, ModeList) ->
     Self = self(),
     Ref = make_ref(),
+    Utag = erlang:spread_utag(true),
     Pid = 
 	erlang:Spawn(
 	  fun() ->
+		  erlang:restore_utag(Utag),
 		  %% process_flag(trap_exit, true),
 		  case parse_options(ModeList) of
 		      {ReadMode, UnicodeMode, Opts} ->
@@ -84,6 +86,7 @@ do_start(Spawn, Owner, FileName, ModeList) ->
 			  exit(Reason1)
 		  end
 	  end),
+    erlang:restore_utag(Utag),
     Mref = erlang:monitor(process, Pid),
     receive
 	{Ref, {error, _Reason} = Error} ->
-- 
cgit v1.2.3