浏览代码

remove redundant mount/unmount calls on commit

daemon.Diff already implements mounting for naivegraphdriver and
aufs which does diffing on its owns does not need the container to be mounted.
So new filesystem driver should mount filesystems on their own if it is needed
to implement Diff(). This issue was reported by @kvasdopil while working on a
freebsd port, because freebsd does not allow mount an already mounted
filesystem. Also it saves some cycles for other operating systems as well.

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Jörg Thalheim 10 年之前
父节点
当前提交
6473b0f127
共有 2 个文件被更改,包括 0 次插入10 次删除
  1. 0 5
      daemon/commit.go
  2. 0 5
      daemon/container_linux.go

+ 0 - 5
daemon/commit.go

@@ -23,11 +23,6 @@ func (daemon *Daemon) Commit(container *Container, repository, tag, comment, aut
 		defer container.Unpause()
 	}
 
-	if err := container.Mount(); err != nil {
-		return nil, err
-	}
-	defer container.Unmount()
-
 	rwTar, err := container.ExportRw()
 	if err != nil {
 		return nil, err

+ 0 - 5
daemon/container_linux.go

@@ -828,20 +828,15 @@ func (container *Container) verifyDaemonSettings() {
 }
 
 func (container *Container) ExportRw() (archive.Archive, error) {
-	if err := container.Mount(); err != nil {
-		return nil, err
-	}
 	if container.daemon == nil {
 		return nil, fmt.Errorf("Can't load storage driver for unregistered container %s", container.ID)
 	}
 	archive, err := container.daemon.Diff(container)
 	if err != nil {
-		container.Unmount()
 		return nil, err
 	}
 	return ioutils.NewReadCloserWrapper(archive, func() error {
 			err := archive.Close()
-			container.Unmount()
 			return err
 		}),
 		nil