From 75ce426fdb46c140ee2a930b46e3679fc8ef2581 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 26 Jan 2009 15:53:54 +0100 Subject: [PATCH] blkid: add uuid and version support to gfs2 Signed-off-by: Karel Zak --- libs/blkid/src/probers/gfs.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/blkid/src/probers/gfs.c b/libs/blkid/src/probers/gfs.c index 17358ef0..584561cf 100644 --- a/libs/blkid/src/probers/gfs.c +++ b/libs/blkid/src/probers/gfs.c @@ -1,8 +1,4 @@ /* - * Copyright (C) 1999 by Andries Brouwer - * Copyright (C) 1999, 2000, 2003 by Theodore Ts'o - * Copyright (C) 2001 by Andreas Dilger - * Copyright (C) 2004 Kay Sievers * Copyright (C) 2008 Karel Zak * * This file may be redistributed under the terms of the @@ -73,7 +69,7 @@ static int probe_gfs(blkid_probe pr, const struct blkid_idmag *mag) if (be32_to_cpu(sbd->sb_fs_format) == GFS_FORMAT_FS && be32_to_cpu(sbd->sb_multihost_format) == GFS_FORMAT_MULTI) { - if (strlen(sbd->sb_locktable)) + if (*sbd->sb_locktable) blkid_probe_set_label(pr, (unsigned char *) sbd->sb_locktable, sizeof(sbd->sb_locktable)); @@ -96,10 +92,12 @@ static int probe_gfs2(blkid_probe pr, const struct blkid_idmag *mag) if (be32_to_cpu(sbd->sb_fs_format) == GFS2_FORMAT_FS && be32_to_cpu(sbd->sb_multihost_format) == GFS2_FORMAT_MULTI) { - if (strlen(sbd->sb_locktable)) + if (*sbd->sb_locktable) blkid_probe_set_label(pr, (unsigned char *) sbd->sb_locktable, sizeof(sbd->sb_locktable)); + blkid_probe_set_uuid(pr, sbd->sb_uuid); + blkid_probe_set_version(pr, "1"); return 0; } return -1; -- 2.39.5