[Cluster-devel] [PATCH v2 0/8] gfs2-utils: Import linux/gfs2_ondisk.h

Andrew Price anprice at redhat.com
Mon Apr 19 19:11:09 UTC 2021


v1: https://listman.redhat.com/archives/cluster-devel/2019-April/msg00021.html

My previous attempt at this did a search+replace to satisfy the field types in gfs2_ondisk.h, which was a little OTT. This attempt adds a linux/types.h that gfs2_ondisk.h will pick up instead of the kernel one.

Having our own gfs2_ondisk.h means that we can support new gfs2 features unconditionally and more easily experiment with on-disk changes; we can use the PRI* macros from inttypes.h for consistent string formatting (appease -Wformat) across architectures, and it gets us closer to being able to compile gfs2-utils on non-linux systems.

Andy


Andrew Price (8):
  Import linux/gfs2_ondisk.h
  Remove HAS_UUID conditionals
  Remove GFS2_HAS_LEAF_HINTS conditionals
  Remove GFS2_HAS_DE_RAHEAD/COOKIE conditionals
  Remove GFS2_HAS_RG_SKIP conditionals
  Remove GFS2_HAS_RG_RI_FIELDS conditionals
  Remove GFS2_HAS_LH_V2 conditionals
  Use PRI* when printing gfs2 structures

 configure.ac                   |  25 +-
 gfs2/convert/gfs2_convert.c    |   2 -
 gfs2/edit/extended.c           |  54 ++--
 gfs2/edit/gfs2hex.c            |  45 ++-
 gfs2/edit/hexedit.c            |   2 -
 gfs2/edit/hexedit.h            |   1 -
 gfs2/edit/journal.c            |  15 +-
 gfs2/edit/savemeta.c           |   2 -
 gfs2/fsck/fs_recovery.c        |  10 +-
 gfs2/fsck/initialize.c         |  47 ++-
 gfs2/fsck/lost_n_found.c       |  10 +-
 gfs2/fsck/pass1.c              |   5 +-
 gfs2/fsck/pass2.c              |   2 +-
 gfs2/fsck/rgrepair.c           |  37 +--
 gfs2/include/Makefile.am       |   2 +
 gfs2/include/gfs2_ondisk.h     | 542 +++++++++++++++++++++++++++++++++
 gfs2/include/linux/types.h     |  32 ++
 gfs2/libgfs2/buf.c             |   1 -
 gfs2/libgfs2/device_geometry.c |   1 -
 gfs2/libgfs2/fs_ops.c          |   7 -
 gfs2/libgfs2/gfs1.c            |   2 -
 gfs2/libgfs2/lang.c            |  11 +-
 gfs2/libgfs2/libgfs2.h         |   6 +-
 gfs2/libgfs2/meta.c            |  27 +-
 gfs2/libgfs2/ondisk.c          | 266 ++++++----------
 gfs2/libgfs2/recovery.c        |   2 -
 gfs2/libgfs2/rgrp.c            |   8 -
 gfs2/libgfs2/structures.c      |  24 +-
 gfs2/mkfs/gfs2_mkfs.h          |   1 -
 gfs2/mkfs/main_grow.c          |   1 -
 gfs2/mkfs/main_jadd.c          |  10 +-
 gfs2/mkfs/main_mkfs.c          |  17 +-
 gfs2/tune/super.c              |  17 +-
 33 files changed, 773 insertions(+), 461 deletions(-)
 create mode 100644 gfs2/include/gfs2_ondisk.h
 create mode 100644 gfs2/include/linux/types.h

-- 
2.30.2




More information about the Cluster-devel mailing list