adjust

cmd/clone.go

@@ -95,7 +95,6 @@ func clone(ctx *cli.Context) error {
 	if srcMp != dstMp {
 		return fmt.Errorf("the clone DST path should be at the same mount point as the SRC path")
 	}
-
 	if strings.HasPrefix(dstAbsPath, srcAbsPath) {
 		return fmt.Errorf("the clone DST path should not be under the SRC path")
 	}
@@ -143,20 +142,16 @@ func clone(ctx *cli.Context) error {
 	}
 	return nil
 }
-func findMountpoint(dir string) (string, error) {
-	odir := dir
-	for dir != "" {
-		inode, err := utils.GetFileInode(dir)
+
+func findMountpoint(fpath string) (string, error) {
+	for p := fpath; p != "/"; p = filepath.Dir(p) {
+		inode, err := utils.GetFileInode(p)
 		if err != nil {
-			return "", fmt.Errorf("get inode of %s: %s", dir, err)
+			return "", fmt.Errorf("get inode of %s: %s", p, err)
 		}
 		if inode == uint64(meta.RootInode) {
-			return dir, nil
-		}
-		dir = filepath.Dir(dir)
-		if dir == "/" {
-			return "", fmt.Errorf("%s is not inside JuiceFS", odir)
+			return p, nil
 		}
 	}
-	return "", fmt.Errorf("%s is not inside JuiceFS", odir)
+	return "", fmt.Errorf("%s is not inside JuiceFS", fpath)
 }

cmd/info.go

@@ -113,7 +113,7 @@ func info(ctx *cli.Context) error {
 		}
 		f, err := openController(d)
 		if err != nil {
-			logger.Errorf("open control file for: %s", err)
+			logger.Errorf("Open control file for %s: %s", d, err)
 			continue
 		}
 
@@ -246,7 +246,7 @@ func ltypeToString(t uint32) string {
 func legacyInfo(d, path string, inode uint64, recursive, raw uint8) {
 	f, err := openController(d)
 	if err != nil {
-		logger.Errorf("open control file for: %s", err)
+		logger.Errorf("Open control file for %s: %s", d, err)
 		return
 	}
 	defer f.Close()

cmd/rmr.go

@@ -73,7 +73,7 @@ func rmr(ctx *cli.Context) error {
 		}
 		f, err := openController(d)
 		if err != nil {
-			logger.Errorf("open control file for: %s", err)
+			logger.Errorf("Open control file for %s: %s", d, err)
 			continue
 		}
 		wb := utils.NewBuffer(8 + 8 + 1 + uint32(len(name)))

cmd/warmup.go

@@ -184,7 +184,7 @@ func warmup(ctx *cli.Context) error {
 	}
 	controller, err := openController(mp)
 	if err != nil {
-		return fmt.Errorf("open control file for: %s", first)
+		return fmt.Errorf("open control file for %s: %s", first, err)
 	}
 	defer controller.Close()