X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=util.c;h=897360cd665136e1ebedaceb66571e75c1577bc0;hb=a85d93d9d5c06911d843f281439a8d3e65aeb165;hp=d892e75120fd05a48606fdf84b1ee9ac63ff5f71;hpb=ce58e4c2a04da0fdbc16746698a37cdef4d70f56;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/util.c b/util.c
index d892e75..897360c 100644
--- a/util.c
+++ b/util.c
@@ -3502,11 +3502,9 @@ Perl_sv_lock(pTHX_ SV *osv)
     MAGIC *mg;
     SV *sv = osv;
 
-    SvLOCK(osv);
+    LOCK_SV_LOCK_MUTEX;
     if (SvROK(sv)) {
 	sv = SvRV(sv);
-	SvUNLOCK(osv);
-	SvLOCK(sv);
     }
 
     mg = condpair_magic(sv);
@@ -3523,7 +3521,7 @@ Perl_sv_lock(pTHX_ SV *osv)
 	MUTEX_UNLOCK(MgMUTEXP(mg));
 	SAVEDESTRUCTOR_X(Perl_unlock_condpair, sv);
     }
-    SvUNLOCK(sv);
+    UNLOCK_SV_LOCK_MUTEX;
     return sv;
 }
 
@@ -3898,7 +3896,7 @@ Perl_report_closed_fh(pTHX_ GV *gv, IO *io, const char *func, const char *obj)
     assert(gv);
 
     sv = sv_newmortal();
-    gv_efullname3(sv, gv, Nullch);
+    gv_efullname4(sv, gv, Nullch, FALSE);
     name = SvPVX(sv);
 
     Perl_warner(aTHX_ WARN_CLOSED, "%s() on closed %s %s", func, obj, name);