using mountpoint instead of mdtname for fid2path

Author: edwardsp

cmd/changelog-reader/main.go

@@ -152,7 +152,7 @@ func create_symlink(ctx context.Context, name string) {
 	}
 }
 
-func slink(ctx context.Context, mdtname string, rec *llapi.ChangelogRecord) {
+func slink(ctx context.Context, rec *llapi.ChangelogRecord) {
 	tname, err := getPath(rec.Name(), rec.ParentFid().String())
 	if err != nil {
 		fmt.Printf("error in getPath: %s\n", err)
@@ -170,7 +170,7 @@ func slink(ctx context.Context, mdtname string, rec *llapi.ChangelogRecord) {
 }
 
 // only handle symlinks here
-func unlnk(ctx context.Context, mdtname string, rec *llapi.ChangelogRecord) {
+func unlnk(ctx context.Context, rec *llapi.ChangelogRecord) {
 	// if the target is in symlinkLookup we need to delete it
 	if _, ok := symlinkLookup[rec.TargetFid().String()]; ok {
 		tname, err := getPath(rec.Name(), rec.ParentFid().String())
@@ -216,7 +216,7 @@ func create_dir(ctx context.Context, name string) {
 	}
 }
 
-func mkdir(ctx context.Context, mdtname string, rec *llapi.ChangelogRecord) {
+func mkdir(ctx context.Context, rec *llapi.ChangelogRecord) {
 	//var recno int64 = 0
 	//var linkno int = 0
 	//tname, _ := llapi.Fid2Path(mdtname, rec.TargetFid(), &recno, &linkno)
@@ -242,7 +242,7 @@ func mkdir(ctx context.Context, mdtname string, rec *llapi.ChangelogRecord) {
 	create_dir(ctx, tname)
 }
 
-func rmdir(ctx context.Context, mdtname string, rec *llapi.ChangelogRecord) {
+func rmdir(ctx context.Context, rec *llapi.ChangelogRecord) {
 	tname, err := getPath(rec.Name(), rec.ParentFid().String())
 	if err != nil {
 		fmt.Printf("error in getPath: %s\n", err)
@@ -293,7 +293,7 @@ func rmdir(ctx context.Context, mdtname string, rec *llapi.ChangelogRecord) {
 //   - If the file size is larger than 256MB then it must be restored if in archive
 // and then marked as dirty.
 
-func renme(ctx context.Context, mdtname string, rec *llapi.ChangelogRecord) {
+func renme(ctx context.Context, rec *llapi.ChangelogRecord) {
 	tname, err := getPath(rec.Name(), rec.ParentFid().String())
 	if err != nil {
 		fmt.Printf("error in getPath: %s\n", err)
@@ -432,12 +432,12 @@ func renme(ctx context.Context, mdtname string, rec *llapi.ChangelogRecord) {
 }
 
 // we only need to update the layout for a directory
-func update_layout(ctx context.Context, mdtname string, rec *llapi.ChangelogRecord) {
+func update_layout(ctx context.Context, rec *llapi.ChangelogRecord) {
 	tfid := rec.TargetFid()
 
 	recno := int64(0)
 	linkno := 0
-	target_name, err := llapi.Fid2Path(mdtname, tfid, &recno, &linkno)
+	target_name, err := llapi.Fid2Path(mountRoot, tfid, &recno, &linkno)
 	if err != nil {
 		fmt.Printf("Error getting the path from a fid [%s]\n", err)
 		return
@@ -470,12 +470,12 @@ func update_layout(ctx context.Context, mdtname string, rec *llapi.ChangelogReco
 	}
 }
 
-func update_metadata(ctx context.Context, mdtname string, rec *llapi.ChangelogRecord) {
+func update_metadata(ctx context.Context, rec *llapi.ChangelogRecord) {
 	tfid := rec.TargetFid()
 
 	recno := int64(0)
 	linkno := 0
-	target_name, err := llapi.Fid2Path(mdtname, tfid, &recno, &linkno)
+	target_name, err := llapi.Fid2Path(mountRoot, tfid, &recno, &linkno)
 	if err != nil {
 		fmt.Printf("Error getting the path from a fid [%s]\n", err)
 		return
@@ -650,27 +650,27 @@ func process_changelog(mdtname string, userid string) {
 		switch {
 		case rectype == "MKDIR":
 			display_changelog(rec)
-			mkdir(ctx, mdtname, rec)
+			mkdir(ctx, rec)
 		case rectype == "RMDIR":
 			display_changelog(rec)
-			rmdir(ctx, mdtname, rec)
+			rmdir(ctx, rec)
 		case rectype == "RENME":
 			display_changelog(rec)
-			renme(ctx, mdtname, rec)
+			renme(ctx, rec)
 		//case rectype == "XATTR":
-		//	update_metadata(ctx, mdtname, rec)
+		//	update_metadata(ctx, rec)
 		case rectype == "SATTR":
 			display_changelog(rec)
-			update_metadata(ctx, mdtname, rec)
+			update_metadata(ctx, rec)
 		case rectype == "LYOUT":
 			display_changelog(rec)
-			update_layout(ctx, mdtname, rec)
+			update_layout(ctx, rec)
 		case rectype == "SLINK":
 			display_changelog(rec)
-			slink(ctx, mdtname, rec)
+			slink(ctx, rec)
 		case rectype == "UNLNK":
 			display_changelog(rec)
-			unlnk(ctx, mdtname, rec)
+			unlnk(ctx, rec)
 		default:
 			if debug == true {
 				display_changelog(rec)