refactor

cmd/clone.go

@@ -96,7 +96,7 @@ func clone(ctx *cli.Context) error {
 		return fmt.Errorf("the clone DST path should be at the same mount point as the SRC path")
 	}
 
-	if strings.HasPrefix(strings.TrimLeft(dstAbsPath, dstMp), strings.TrimLeft(srcAbsPath, srcMp)) {
+	if strings.HasPrefix(dstAbsPath, srcAbsPath) {
 		return fmt.Errorf("the clone DST path should not be under the SRC path")
 	}
 
@@ -124,7 +124,7 @@ func clone(ctx *cli.Context) error {
 	wb.Put16(uint16(umask))
 	wb.Put8(cmode)
 	var f *os.File
-	f, err = openController(srcMp)
+	f, err = findAndOpenControlFile(srcMp)
 	if err == nil {
 		return err
 	}

cmd/info.go

@@ -111,15 +111,9 @@ func info(ctx *cli.Context) error {
 		if inode < uint64(meta.RootInode) {
 			logger.Fatalf("inode number shouldn't be less than %d", meta.RootInode)
 		}
-		mp, err := findMountpoint(d)
+		f, err := findAndOpenControlFile(d)
 		if err != nil {
-			logger.Errorf("find mountpoint: %s", err)
-			continue
-		}
-		var f *os.File
-		f, err = openController(mp)
-		if err != nil {
-			logger.Errorf("open controller: %s", err)
+			logger.Errorf("open control file for: %s", err)
 			continue
 		}
 
@@ -250,15 +244,9 @@ func ltypeToString(t uint32) string {
 }
 
 func legacyInfo(d, path string, inode uint64, recursive, raw uint8) {
-	mp, err := findMountpoint(d)
-	if err != nil {
-		logger.Errorf("find mountpoint: %s", err)
-		return
-	}
-	var f *os.File
-	f, err = openController(mp)
+	f, err := findAndOpenControlFile(d)
 	if err != nil {
-		logger.Errorf("open controller: %s", err)
+		logger.Errorf("open control file for: %s", err)
 		return
 	}
 	defer f.Close()

cmd/rmr.go

@@ -42,7 +42,11 @@ $ juicefs rmr /mnt/jfs/foo`,
 	}
 }
 
-func openController(mp string) (*os.File, error) {
+func findAndOpenControlFile(path string) (*os.File, error) {
+	mp, err := findMountpoint(path)
+	if err != nil {
+		return nil, err
+	}
 	return os.OpenFile(filepath.Join(mp, ".control"), os.O_RDWR, 0)
 }
 
@@ -67,16 +71,9 @@ func rmr(ctx *cli.Context) error {
 		if err != nil {
 			return fmt.Errorf("lookup inode for %s: %s", d, err)
 		}
-		var mp string
-		mp, err = findMountpoint(d)
-		if err != nil {
-			logger.Errorf("find mountpoint for %s: %s", d, err)
-			continue
-		}
-		var f *os.File
-		f, err = openController(mp)
+		f, err := findAndOpenControlFile(d)
 		if err != nil {
-			logger.Errorf("open controller: %s", err)
+			logger.Errorf("open control file for: %s", err)
 			continue
 		}
 		wb := utils.NewBuffer(8 + 8 + 1 + uint32(len(name)))

cmd/warmup.go

@@ -182,22 +182,12 @@ func warmup(ctx *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	controller, err := openController(mp)
+	controller, err := findAndOpenControlFile(mp)
 	if err != nil {
-		return fmt.Errorf("open control file for %s", first)
+		return fmt.Errorf("open control file for: %s", first)
 	}
 	defer controller.Close()
 
-	for ; mp != "/"; mp = filepath.Dir(mp) {
-		inode, err := utils.GetFileInode(mp)
-		if err != nil {
-			logger.Fatalf("lookup inode for %s: %s", mp, err)
-		}
-		if inode == uint64(meta.RootInode) {
-			break
-		}
-	}
-
 	threads := ctx.Uint("threads")
 	if threads == 0 {
 		logger.Warnf("threads should be larger than 0, reset it to 1")