From 09351e3831ed149bfc2aced59117f95d094ee9a5 Mon Sep 17 00:00:00 2001 From: Anand Jain Date: Mon, 14 Aug 2023 23:28:08 +0800 Subject: [PATCH] btrfs-progs: rename fs_devices::latest_trans to match the kernel Aligning progs's struct btrfs_fs_devices with the kernel rename btrfs_fs_devices::latest_trans to btrfs_fs_devices::latest_generation. Signed-off-by: Anand Jain Signed-off-by: David Sterba --- kernel-shared/volumes.c | 6 +++--- kernel-shared/volumes.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel-shared/volumes.c b/kernel-shared/volumes.c index 0a3b2959..ad006b9d 100644 --- a/kernel-shared/volumes.c +++ b/kernel-shared/volumes.c @@ -368,7 +368,7 @@ static int device_list_add(const char *path, fs_devices->latest_devid = devid; /* Below we would set this to found_transid */ - fs_devices->latest_trans = 0; + fs_devices->latest_generation = 0; fs_devices->lowest_devid = (u64)-1; fs_devices->chunk_alloc_policy = BTRFS_CHUNK_ALLOC_REGULAR; device = NULL; @@ -438,9 +438,9 @@ static int device_list_add(const char *path, if (metadata_uuid) fs_devices->active_metadata_uuid = true; - if (found_transid > fs_devices->latest_trans) { + if (found_transid > fs_devices->latest_generation) { fs_devices->latest_devid = devid; - fs_devices->latest_trans = found_transid; + fs_devices->latest_generation = found_transid; fs_devices->total_devices = device->total_devs; } if (fs_devices->lowest_devid > devid) { diff --git a/kernel-shared/volumes.h b/kernel-shared/volumes.h index 2bf7b9d7..7f571bdd 100644 --- a/kernel-shared/volumes.h +++ b/kernel-shared/volumes.h @@ -85,7 +85,7 @@ struct btrfs_fs_devices { /* the device with this id has the most recent copy of the super */ u64 latest_devid; - u64 latest_trans; + u64 latest_generation; u64 lowest_devid; u64 num_devices;