diff --git a/core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala b/core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala
index 054f66a8b726027dc0c8f459bf7f89b4fad64f24..cf6ef0029a861e42dbf0ef4cc622234b4a10cee5 100644
--- a/core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala
+++ b/core/src/main/scala/org/apache/spark/storage/DiskBlockManager.scala
@@ -150,11 +150,12 @@ private[spark] class DiskBlockManager(shuffleManager: ShuffleBlockManager, rootD
     Runtime.getRuntime.addShutdownHook(new Thread("delete Spark local dirs") {
       override def run() {
         logDebug("Shutdown hook called")
-        stop()
+        DiskBlockManager.this.stop()
       }
     })
   }
 
+  /** Cleanup local dirs and stop shuffle sender. */
   private[spark] def stop() {
     localDirs.foreach { localDir =>
       if (localDir.isDirectory() && localDir.exists()) {