Parcourir la source

Merge pull request #19873 from HackToday/refactorfs

Make btrfs call same interface as others
Brian Goff il y a 9 ans
Parent
commit
967848419a
1 fichiers modifiés avec 3 ajouts et 4 suppressions
  1. 3 4
      daemon/graphdriver/btrfs/btrfs.go

+ 3 - 4
daemon/graphdriver/btrfs/btrfs.go

@@ -31,14 +31,13 @@ func init() {
 // Init returns a new BTRFS driver.
 // Init returns a new BTRFS driver.
 // An error is returned if BTRFS is not supported.
 // An error is returned if BTRFS is not supported.
 func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (graphdriver.Driver, error) {
 func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (graphdriver.Driver, error) {
-	rootdir := path.Dir(home)
 
 
-	var buf syscall.Statfs_t
-	if err := syscall.Statfs(rootdir, &buf); err != nil {
+	fsMagic, err := graphdriver.GetFSMagic(home)
+	if err != nil {
 		return nil, err
 		return nil, err
 	}
 	}
 
 
-	if graphdriver.FsMagic(buf.Type) != graphdriver.FsMagicBtrfs {
+	if fsMagic != graphdriver.FsMagicBtrfs {
 		return nil, graphdriver.ErrPrerequisites
 		return nil, graphdriver.ErrPrerequisites
 	}
 	}