From 6301795f753174b0badf1003509146d2d41bd435 Mon Sep 17 00:00:00 2001
From: Ayush Ranjan <ayushranjan@google.com>
Date: Fri, 16 Aug 2024 08:54:05 -0700
Subject: [PATCH] Pass Loader to preSaveImpl(), postRestoreImpl() and
 postResumeImpl().

PiperOrigin-RevId: 663745544
---
 runsc/boot/controller.go   | 2 +-
 runsc/boot/restore.go      | 6 +++---
 runsc/boot/restore_impl.go | 7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/runsc/boot/controller.go b/runsc/boot/controller.go
index baa79ac49..09146ce7d 100644
--- a/runsc/boot/controller.go
+++ b/runsc/boot/controller.go
@@ -671,7 +671,7 @@ func (cm *containerManager) Pause(_, _ *struct{}) error {
 // Resume resumes all tasks.
 func (cm *containerManager) Resume(_, _ *struct{}) error {
 	cm.l.k.Unpause()
-	return postResumeImpl(cm.l.k)
+	return postResumeImpl(cm.l)
 }
 
 // Wait waits for the init process in the given container.
diff --git a/runsc/boot/restore.go b/runsc/boot/restore.go
index 44069f8b5..0343f2c74 100644
--- a/runsc/boot/restore.go
+++ b/runsc/boot/restore.go
@@ -299,7 +299,7 @@ func (r *restorer) restore(l *Loader) error {
 		r.pagesMetadata.Close()
 	}
 
-	if err := postRestoreImpl(l.k); err != nil {
+	if err := postRestoreImpl(l); err != nil {
 		return err
 	}
 
@@ -328,7 +328,7 @@ func (l *Loader) save(o *control.SaveOpts) (err error) {
 	}
 	o.Metadata["container_count"] = strconv.Itoa(l.containerCount())
 
-	if err := preSaveImpl(l.k, o); err != nil {
+	if err := preSaveImpl(l, o); err != nil {
 		return err
 	}
 
@@ -341,7 +341,7 @@ func (l *Loader) save(o *control.SaveOpts) (err error) {
 	}
 
 	if o.Resume {
-		if err := postResumeImpl(l.k); err != nil {
+		if err := postResumeImpl(l); err != nil {
 			return err
 		}
 	}
diff --git a/runsc/boot/restore_impl.go b/runsc/boot/restore_impl.go
index 5b1aa7e88..5be050ecb 100644
--- a/runsc/boot/restore_impl.go
+++ b/runsc/boot/restore_impl.go
@@ -21,20 +21,19 @@ import (
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"gvisor.dev/gvisor/pkg/sentry/control"
 	"gvisor.dev/gvisor/pkg/sentry/fsimpl/proc"
-	"gvisor.dev/gvisor/pkg/sentry/kernel"
 )
 
-func preSaveImpl(*kernel.Kernel, *control.SaveOpts) error {
+func preSaveImpl(*Loader, *control.SaveOpts) error {
 	return nil
 }
 
 // Precondition: The kernel should be running.
-func postRestoreImpl(*kernel.Kernel) error {
+func postRestoreImpl(*Loader) error {
 	return nil
 }
 
 // Precondition: The kernel should be running.
-func postResumeImpl(*kernel.Kernel) error {
+func postResumeImpl(*Loader) error {
 	return nil
 }