]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mips: add asm/stat.h to UAPI compile-test coverage
authorMasahiro Yamada <masahiroy@kernel.org>
Mon, 4 Apr 2022 06:19:44 +0000 (15:19 +0900)
committerArnd Bergmann <arnd@arndb.de>
Fri, 13 May 2022 08:56:10 +0000 (10:56 +0200)
asm/stat.h is currently excluded from the UAPI compile-test for
ARCH=mips because of the errors like follows:

    HDRTEST usr/include/asm/stat.h
  In file included from <command-line>:32:
  ./usr/include/asm/stat.h:22:2: error: unknown type name 'ino_t'
     22 |  ino_t  st_ino;
        |  ^~~~~
  ./usr/include/asm/stat.h:23:2: error: unknown type name 'mode_t'
     23 |  mode_t  st_mode;
        |  ^~~~~~
  ./usr/include/asm/stat.h:25:2: error: unknown type name 'uid_t'
     25 |  uid_t  st_uid;
        |  ^~~~~
  ./usr/include/asm/stat.h:26:2: error: unknown type name 'gid_t'
     26 |  gid_t  st_gid;
        |  ^~~~~
  ./usr/include/asm/stat.h:58:2: error: unknown type name 'mode_t'
     58 |  mode_t  st_mode;
        |  ^~~~~~
  ./usr/include/asm/stat.h:61:2: error: unknown type name 'uid_t'
     61 |  uid_t  st_uid;
        |  ^~~~~
  ./usr/include/asm/stat.h:62:2: error: unknown type name 'gid_t'
     62 |  gid_t  st_gid;
        |  ^~~~~

The errors can be fixed by prefixing the types with __kernel_.

Then, remove the no-header-test entry from user/include/Makefile.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
arch/mips/include/uapi/asm/stat.h
usr/include/Makefile

index 3d2a3b71845cf2a1d748c3d0bdcfb3a5d0c95c59..8a8bb78883a47dcb386df2edc07e4988584d029c 100644 (file)
 struct stat {
        unsigned        st_dev;
        long            st_pad1[3];             /* Reserved for network id */
-       ino_t           st_ino;
-       mode_t          st_mode;
+       __kernel_ino_t  st_ino;
+       __kernel_mode_t st_mode;
        __u32           st_nlink;
-       uid_t           st_uid;
-       gid_t           st_gid;
+       __kernel_uid_t  st_uid;
+       __kernel_gid_t  st_gid;
        unsigned        st_rdev;
        long            st_pad2[2];
        long            st_size;
@@ -55,11 +55,11 @@ struct stat64 {
 
        unsigned long long      st_ino;
 
-       mode_t          st_mode;
+       __kernel_mode_t st_mode;
        __u32           st_nlink;
 
-       uid_t           st_uid;
-       gid_t           st_gid;
+       __kernel_uid_t  st_uid;
+       __kernel_gid_t  st_gid;
 
        unsigned long   st_rdev;
        unsigned long   st_pad1[3];     /* Reserved for st_rdev expansion  */
@@ -96,11 +96,11 @@ struct stat {
 
        unsigned long           st_ino;
 
-       mode_t                  st_mode;
+       __kernel_mode_t         st_mode;
        __u32                   st_nlink;
 
-       uid_t                   st_uid;
-       gid_t                   st_gid;
+       __kernel_uid_t          st_uid;
+       __kernel_gid_t          st_gid;
 
        unsigned int            st_rdev;
        unsigned int            st_pad1[3]; /* Reserved for st_rdev expansion */
index a1a8403896cfccfe9faaed69d1c536f579349d3a..da280bdcb39112329434a7486c1de68ddcfc332e 100644 (file)
@@ -65,10 +65,6 @@ no-header-test += asm/sigcontext.h
 no-header-test += linux/if_bonding.h
 endif
 
-ifeq ($(SRCARCH),mips)
-no-header-test += asm/stat.h
-endif
-
 ifeq ($(SRCARCH),powerpc)
 no-header-test += asm/stat.h
 no-header-test += linux/bpf_perf_event.h