Merge branch 'guilt/xfs-unsigned-flags-5.18' into xfs-5.19-for-next

diff --cc fs/xfs/xfs_file.c
Simple merge

diff --cc fs/xfs/xfs_fsops.c
Simple merge

diff --cc fs/xfs/xfs_inode.c
Simple merge

diff --cc fs/xfs/xfs_message.c
index 22c2adff12606a0054db289e8863b0bd45eeb72a,c5084dce75cdcf4fc2671dfc940433353f849609..8f495cc23903b221691632a9034c93141a29e3c9
--- 1/fs/xfs/xfs_message.c
--- 2/fs/xfs/xfs_message.c
+++ b/fs/xfs/xfs_message.c
@@@ -27,34 -27,42 +27,34 @@@ __xfs_printk
        printk("%sXFS: %pV\n", level, vaf);
  }
  
 -#define define_xfs_printk_level(func, kern_level)             \
 -void func(const struct xfs_mount *mp, const char *fmt, ...)   \
 -{                                                             \
 -      struct va_format        vaf;                            \
 -      va_list                 args;                           \
 -      int                     level;                          \
 -                                                              \
 -      va_start(args, fmt);                                    \
 -                                                              \
 -      vaf.fmt = fmt;                                          \
 -      vaf.va = &args;                                         \
 -                                                              \
 -      __xfs_printk(kern_level, mp, &vaf);                     \
 -      va_end(args);                                           \
 -                                                              \
 -      if (!kstrtoint(kern_level, 0, &level) &&                \
 -          level <= LOGLEVEL_ERR &&                            \
 -          xfs_error_level >= XFS_ERRLEVEL_HIGH)               \
 -              xfs_stack_trace();                              \
 -}                                                             \
 +void
 +xfs_printk_level(
 +      const char *kern_level,
 +      const struct xfs_mount *mp,
 +      const char *fmt, ...)
 +{
 +      struct va_format        vaf;
 +      va_list                 args;
 +      int                     level;
  
 -define_xfs_printk_level(xfs_emerg, KERN_EMERG);
 -define_xfs_printk_level(xfs_alert, KERN_ALERT);
 -define_xfs_printk_level(xfs_crit, KERN_CRIT);
 -define_xfs_printk_level(xfs_err, KERN_ERR);
 -define_xfs_printk_level(xfs_warn, KERN_WARNING);
 -define_xfs_printk_level(xfs_notice, KERN_NOTICE);
 -define_xfs_printk_level(xfs_info, KERN_INFO);
 -#ifdef DEBUG
 -define_xfs_printk_level(xfs_debug, KERN_DEBUG);
 -#endif
 +      va_start(args, fmt);
 +      vaf.fmt = fmt;
 +      vaf.va = &args;
 +
 +      __xfs_printk(kern_level, mp, &vaf);
 +
 +      va_end(args);
 +
 +      if (!kstrtoint(kern_level, 0, &level) &&
 +          level <= LOGLEVEL_ERR &&
 +          xfs_error_level >= XFS_ERRLEVEL_HIGH)
 +              xfs_stack_trace();
 +}
  
  void
 -xfs_alert_tag(
 +_xfs_alert_tag(
        const struct xfs_mount  *mp,
-       int                     panic_tag,
+       uint32_t                panic_tag,
        const char              *fmt, ...)
  {
        struct va_format        vaf;

diff --cc fs/xfs/xfs_message.h
index 035ee3d244ac42dba3840e9e12713ec1d1fcf541,dee98e9ccc3db9aa998ef2974c0cb96ed2218b4f..55ee464ab59f1038238683099c7574956f1cf8e0
--- 1/fs/xfs/xfs_message.h
--- 2/fs/xfs/xfs_message.h
+++ b/fs/xfs/xfs_message.h
@@@ -6,45 -6,34 +6,46 @@@
  
  struct xfs_mount;
  
 -extern __printf(2, 3)
 -void xfs_emerg(const struct xfs_mount *mp, const char *fmt, ...);
 -extern __printf(2, 3)
 -void xfs_alert(const struct xfs_mount *mp, const char *fmt, ...);
  extern __printf(3, 4)
 -void xfs_alert_tag(const struct xfs_mount *mp, uint32_t tag,
 -              const char *fmt, ...);
 -extern __printf(2, 3)
 -void xfs_crit(const struct xfs_mount *mp, const char *fmt, ...);
 -extern __printf(2, 3)
 -void xfs_err(const struct xfs_mount *mp, const char *fmt, ...);
 -extern __printf(2, 3)
 -void xfs_warn(const struct xfs_mount *mp, const char *fmt, ...);
 -extern __printf(2, 3)
 -void xfs_notice(const struct xfs_mount *mp, const char *fmt, ...);
 -extern __printf(2, 3)
 -void xfs_info(const struct xfs_mount *mp, const char *fmt, ...);
 +void xfs_printk_level(const char *kern_level, const struct xfs_mount *mp,
 +                      const char *fmt, ...);
  
 +#define xfs_printk_index_wrap(kern_level, mp, fmt, ...)               \
 +({                                                            \
 +      printk_index_subsys_emit("%sXFS%s: ", kern_level, fmt); \
 +      xfs_printk_level(kern_level, mp, fmt, ##__VA_ARGS__);   \
 +})
 +#define xfs_emerg(mp, fmt, ...) \
 +      xfs_printk_index_wrap(KERN_EMERG, mp, fmt, ##__VA_ARGS__)
 +#define xfs_alert(mp, fmt, ...) \
 +      xfs_printk_index_wrap(KERN_ALERT, mp, fmt, ##__VA_ARGS__)
 +#define xfs_crit(mp, fmt, ...) \
 +      xfs_printk_index_wrap(KERN_CRIT, mp, fmt, ##__VA_ARGS__)
 +#define xfs_err(mp, fmt, ...) \
 +      xfs_printk_index_wrap(KERN_ERR, mp, fmt, ##__VA_ARGS__)
 +#define xfs_warn(mp, fmt, ...) \
 +      xfs_printk_index_wrap(KERN_WARNING, mp, fmt, ##__VA_ARGS__)
 +#define xfs_notice(mp, fmt, ...) \
 +      xfs_printk_index_wrap(KERN_NOTICE, mp, fmt, ##__VA_ARGS__)
 +#define xfs_info(mp, fmt, ...) \
 +      xfs_printk_index_wrap(KERN_INFO, mp, fmt, ##__VA_ARGS__)
  #ifdef DEBUG
 -extern __printf(2, 3)
 -void xfs_debug(const struct xfs_mount *mp, const char *fmt, ...);
 +#define xfs_debug(mp, fmt, ...) \
 +      xfs_printk_index_wrap(KERN_DEBUG, mp, fmt, ##__VA_ARGS__)
  #else
 -static inline __printf(2, 3)
 -void xfs_debug(const struct xfs_mount *mp, const char *fmt, ...)
 -{
 -}
 +#define xfs_debug(mp, fmt, ...) do {} while (0)
  #endif
  
- void _xfs_alert_tag(const struct xfs_mount *mp, int tag, const char *fmt, ...);
 +#define xfs_alert_tag(mp, tag, fmt, ...)                      \
 +({                                                            \
 +      printk_index_subsys_emit("%sXFS%s: ", KERN_ALERT, fmt); \
 +      _xfs_alert_tag(mp, tag, fmt, ##__VA_ARGS__);            \
 +})
 +
 +extern __printf(3, 4)
++void _xfs_alert_tag(const struct xfs_mount *mp, uint32_t tag,
++              const char *fmt, ...);
 +
  #define xfs_printk_ratelimited(func, dev, fmt, ...)                   \
  do {                                                                  \
        static DEFINE_RATELIMIT_STATE(_rs,                              \

diff --cc fs/xfs/xfs_mount.h
Simple merge

diff --cc fs/xfs/xfs_trans.h
Simple merge