logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0002-Move-definition-of-blk_zone_v2.patch (2899B)

    

  1. From 8aee18d96218ce523e705e0bb43b8b67909f83aa Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Fri, 4 Sep 2020 22:33:09 -0700
  4. Subject: [PATCH] Move definition of blk_zone_v2
  6. Otherwise, the definitions of blk_zone_type_str and blk_zone_cond_str
  7. still refer to the original struct blk_zone.
  8. ---
  9.  include/f2fs_fs.h | 56 +++++++++++++++++++++++------------------------
  10.  1 file changed, 28 insertions(+), 28 deletions(-)
  12. diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h
  13. index b5bda13..4d99fb7 100644
  14. --- a/include/f2fs_fs.h
  15. +++ b/include/f2fs_fs.h
  16. @@ -1288,6 +1288,34 @@ static inline int get_inline_xattr_addrs(struct f2fs_inode *inode)
  17.  #define blk_zone_seq_pref(z)	((z)->type == BLK_ZONE_TYPE_SEQWRITE_PREF)
  18.  #define blk_zone_seq(z)		(blk_zone_seq_req(z) || blk_zone_seq_pref(z))
  19.  
  20. +/*
  21. + * Handle kernel zone capacity support
  22. + */
  23. +#ifndef HAVE_BLK_ZONE_REP_V2
  24. +#define BLK_ZONE_REP_CAPACITY   (1 << 0)
  25. +struct blk_zone_v2 {
  26. +	__u64   start;          /* Zone start sector */
  27. +	__u64   len;            /* Zone length in number of sectors */
  28. +	__u64   wp;             /* Zone write pointer position */
  29. +	__u8    type;           /* Zone type */
  30. +	__u8    cond;           /* Zone condition */
  31. +	__u8    non_seq;        /* Non-sequential write resources active */
  32. +	__u8    reset;          /* Reset write pointer recommended */
  33. +	__u8    resv[4];
  34. +	__u64   capacity;       /* Zone capacity in number of sectors */
  35. +	__u8    reserved[24];
  36. +};
  37. +#define blk_zone blk_zone_v2
  38. +
  39. +struct blk_zone_report_v2 {
  40. +	__u64   sector;
  41. +	__u32   nr_zones;
  42. +	__u32   flags;
  43. +struct blk_zone zones[0];
  44. +};
  45. +#define blk_zone_report blk_zone_report_v2
  46. +#endif /* HAVE_BLK_ZONE_REP_V2 */
  47. +
  48.  static inline const char *
  49.  blk_zone_type_str(struct blk_zone *blkz)
  50.  {
  51. @@ -1328,34 +1356,6 @@ blk_zone_cond_str(struct blk_zone *blkz)
  52.  	return "Unknown-cond";
  53.  }
  54.  
  55. -/*
  56. - * Handle kernel zone capacity support
  57. - */
  58. -#ifndef HAVE_BLK_ZONE_REP_V2
  59. -#define BLK_ZONE_REP_CAPACITY   (1 << 0)
  60. -struct blk_zone_v2 {
  61. -	__u64   start;          /* Zone start sector */
  62. -	__u64   len;            /* Zone length in number of sectors */
  63. -	__u64   wp;             /* Zone write pointer position */
  64. -	__u8    type;           /* Zone type */
  65. -	__u8    cond;           /* Zone condition */
  66. -	__u8    non_seq;        /* Non-sequential write resources active */
  67. -	__u8    reset;          /* Reset write pointer recommended */
  68. -	__u8    resv[4];
  69. -	__u64   capacity;       /* Zone capacity in number of sectors */
  70. -	__u8    reserved[24];
  71. -};
  72. -#define blk_zone blk_zone_v2
  73. -
  74. -struct blk_zone_report_v2 {
  75. -	__u64   sector;
  76. -	__u32   nr_zones;
  77. -	__u32   flags;
  78. -struct blk_zone zones[0];
  79. -};
  80. -#define blk_zone_report blk_zone_report_v2
  81. -#endif /* HAVE_BLK_ZONE_REP_V2 */
  82. -
  83.  #define blk_zone_empty(z)	(blk_zone_cond(z) == BLK_ZONE_COND_EMPTY)
  84.  #define blk_zone_sector(z)	(z)->start
  85.  #define blk_zone_length(z)	(z)->len
  86. -- 
  87. 2.28.0