github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Clean up error logs and messages in temp mount

Browse Source 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
This commit is contained in:
Derek McGowan
2018-01-05 11:35:29 -08:00
parent 002c0e2901
commit dfd7ee122f
4 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
diff/walking/differ.go
View File

@@ -90,7 +90,7 @@ func (s *walkingDiff) Apply(ctx context.Context, desc ocispec.Descriptor, mounts
}
var ocidesc ocispec.Descriptor
if err := mount.WithTempMount(mounts, func(root string) error {
if err := mount.WithTempMount(ctx, mounts, func(root string) error {
ra, err := s.store.ReaderAt(ctx, desc.Digest)
if err != nil {
return errors.Wrap(err, "failed to get reader from content store")
@@ -158,8 +158,8 @@ func (s *walkingDiff) DiffMounts(ctx context.Context, lower, upper []mount.Mount
}
var ocidesc ocispec.Descriptor
if err := mount.WithTempMount(lower, func(lowerRoot string) error {
return mount.WithTempMount(upper, func(upperRoot string) error {
if err := mount.WithTempMount(ctx, lower, func(lowerRoot string) error {
return mount.WithTempMount(ctx, upper, func(upperRoot string) error {
var newReference bool
if config.Reference == "" {
newReference = true