diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2017-07-10 19:47:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-10 19:47:57 +0000 |
| commit | 4ef0afa5635b9e7009ed5b5a4c057c57137693a3 (patch) | |
| tree | 3d31de7cc152fa8a37fac34644eb16ac528263d8 | |
| parent | 6e2cbd8ecdecfc383a6f243c823846dd269bf2e8 (diff) | |
| parent | 68acc00e578138efb2f11e77b353bda5daa6ae6e (diff) | |
| download | android_external_e2fsprogs-4ef0afa5635b9e7009ed5b5a4c057c57137693a3.tar.gz android_external_e2fsprogs-4ef0afa5635b9e7009ed5b5a4c057c57137693a3.tar.bz2 android_external_e2fsprogs-4ef0afa5635b9e7009ed5b5a4c057c57137693a3.zip | |
Merge "blkid: Resolve to the exFAT uuid change on reboot." am: 6eac3894a6
am: 68acc00e57
Change-Id: Id7f4617e1695fc74f98da60d389adb747ab137d5
| -rw-r--r-- | lib/blkid/probe.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/blkid/probe.c b/lib/blkid/probe.c index fae74a7f..3bcf4c3d 100644 --- a/lib/blkid/probe.c +++ b/lib/blkid/probe.c @@ -1473,6 +1473,7 @@ static int probe_exfat(struct blkid_probe *probe, struct blkid_magic *id, struct exfat_super_block *sb; struct exfat_entry_label *label; uuid_t uuid; + sb = (struct exfat_super_block *)buf; if (!sb || !CLUSTER_SIZE(sb)) { DBG(DEBUG_PROBE, printf("bad exfat superblock.\n")); @@ -1486,11 +1487,11 @@ static int probe_exfat(struct blkid_probe *probe, struct blkid_magic *id, blkid_set_tag(probe->dev, "LABEL", "disk", 4); } + memset(uuid, 0, sizeof (uuid)); snprintf(uuid, sizeof (uuid), "%02hhX%02hhX-%02hhX%02hhX", sb->volume_serial[3], sb->volume_serial[2], sb->volume_serial[1], sb->volume_serial[0]); - - set_uuid(probe->dev, uuid, 0); + blkid_set_tag(probe->dev, "UUID", uuid, strlen(uuid)); return 0; } |