Merge pull request #1 from weafon/vmfs6-64

Add new FS Info magic, VMFSL_FSINFO_MAGIC
teward · Apr 5, 2022 · 582b525 · 582b525
2 parents 3f19634 + 84e094a
commit 582b525
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/libvmfs/vmfs_fs.c b/libvmfs/vmfs_fs.c
@@ -3,6 +3,7 @@
  * Copyright (C) 2009 Christophe Fillot <cf@utc.fr>
  * Copyright (C) 2009,2012 Mike Hommey <mh@glandium.org>
  * Copyright (C) 2018 Weafon Tsao <weafon.tsao@accelstor.com>
+ * Copyright (C) 2020 VMware, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -67,7 +68,7 @@ static int vmfs_fsinfo_read(vmfs_fs_t *fs)
 
    fsi->magic = read_le32(buf,VMFS_FSINFO_OFS_MAGIC);
 
-   if (fsi->magic != VMFS_FSINFO_MAGIC) {
+   if (fsi->magic != VMFS_FSINFO_MAGIC && fsi->magic != VMFSL_FSINFO_MAGIC) {
       fprintf(stderr,"VMFS FSInfo: invalid magic number 0x%8.8x\n",fsi->magic);
       return(-1);
    }

diff --git a/libvmfs/vmfs_fs.h b/libvmfs/vmfs_fs.h
@@ -3,6 +3,7 @@
  * Copyright (C) 2009 Christophe Fillot <cf@utc.fr>
  * Copyright (C) 2009 Mike Hommey <mh@glandium.org>
  * Copyright (C) 2018 Weafon Tsao <weafon.tsao@accelstor.com>
+ * Copyright (C) 2020 VMware, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +25,7 @@
 /* === FS Info === */
 #define VMFS_FSINFO_BASE   0x0200000
 #define VMFS_FSINFO_MAGIC  0x2fabf15e
+#define VMFSL_FSINFO_MAGIC 0x2fabf15f
 
 struct vmfs_fsinfo_raw {
    uint32_t magic;