Update to kernel headers v5.3.2.
Test: Builds and run unit tests on taimen/cuttlefish.
Change-Id: I6ebd8f179d159ac974555e8edca588083e8081b3
diff --git a/libc/kernel/uapi/linux/coda.h b/libc/kernel/uapi/linux/coda.h
index 93d6f7c..aad1b97 100644
--- a/libc/kernel/uapi/linux/coda.h
+++ b/libc/kernel/uapi/linux/coda.h
@@ -38,10 +38,6 @@
typedef unsigned long long u_quad_t;
#endif
#define inline
-struct timespec {
- long ts_sec;
- long ts_nsec;
-};
#else
#include <sys/time.h>
typedef unsigned long long u_quad_t;
@@ -57,12 +53,6 @@
#else
#define cdev_t dev_t
#endif
-#ifdef __CYGWIN32__
-struct timespec {
- time_t tv_sec;
- long tv_nsec;
-};
-#endif
#ifndef __BIT_TYPES_DEFINED__
#define __BIT_TYPES_DEFINED__
typedef signed char int8_t;
@@ -132,6 +122,10 @@
C_VFIFO,
C_VBAD
};
+struct coda_timespec {
+ int64_t tv_sec;
+ long tv_nsec;
+};
struct coda_vattr {
long va_type;
u_short va_mode;
@@ -141,9 +135,9 @@
long va_fileid;
u_quad_t va_size;
long va_blocksize;
- struct timespec va_atime;
- struct timespec va_mtime;
- struct timespec va_ctime;
+ struct coda_timespec va_atime;
+ struct coda_timespec va_mtime;
+ struct coda_timespec va_ctime;
u_long va_gen;
u_long va_flags;
cdev_t va_rdev;
@@ -190,17 +184,18 @@
#define CODA_STATFS 34
#define CODA_STORE 35
#define CODA_RELEASE 36
-#define CODA_NCALLS 37
+#define CODA_ACCESS_INTENT 37
+#define CODA_NCALLS 38
#define DOWNCALL(opcode) (opcode >= CODA_REPLACE && opcode <= CODA_PURGEFID)
#define VC_MAXDATASIZE 8192
#define VC_MAXMSGSIZE sizeof(union inputArgs) + sizeof(union outputArgs) + VC_MAXDATASIZE
#define CIOC_KERNEL_VERSION _IOWR('c', 10, size_t)
-#define CODA_KERNEL_VERSION 3
+#define CODA_KERNEL_VERSION 5
struct coda_in_hdr {
u_int32_t opcode;
u_int32_t unique;
- pid_t pid;
- pid_t pgid;
+ __kernel_pid_t pid;
+ __kernel_pid_t pgid;
vuid_t uid;
};
struct coda_out_hdr {
@@ -439,6 +434,21 @@
struct coda_out_hdr oh;
struct coda_statfs stat;
};
+#define CODA_ACCESS_TYPE_READ 1
+#define CODA_ACCESS_TYPE_WRITE 2
+#define CODA_ACCESS_TYPE_MMAP 3
+#define CODA_ACCESS_TYPE_READ_FINISH 4
+#define CODA_ACCESS_TYPE_WRITE_FINISH 5
+struct coda_access_intent_in {
+ struct coda_in_hdr ih;
+ struct CodaFid VFid;
+ int count;
+ int pos;
+ int type;
+};
+struct coda_access_intent_out {
+ struct coda_out_hdr out;
+};
#define CODA_NOCACHE 0x80000000
union inputArgs {
struct coda_in_hdr ih;
@@ -464,6 +474,7 @@
struct coda_open_by_fd_in coda_open_by_fd;
struct coda_open_by_path_in coda_open_by_path;
struct coda_statfs_in coda_statfs;
+ struct coda_access_intent_in coda_access_intent;
};
union outputArgs {
struct coda_out_hdr oh;