diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-03-15 13:22:00 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-03-15 13:22:00 +0000 |
| commit | a062971fb96ae7154d88ab408f899f56aaf6df6b (patch) | |
| tree | 9907dea0824c38373ef2913fd84385ed07a56c3a /usr/src/uts/common/sys/file.h | |
| parent | 0b570b3cb1c0bf505f1b1bd352664d638b8cc359 (diff) | |
| parent | b4a8b33babbf9a7a5de61ea06d09e1eb537f1f6e (diff) | |
| download | illumos-joyent-a062971fb96ae7154d88ab408f899f56aaf6df6b.tar.gz | |
[illumos-gate merge]
commit b4a8b33babbf9a7a5de61ea06d09e1eb537f1f6e
10483 aac: cast between incompatible function types
commit a00b240dc61ea7ab64e3881b755fca973a531e89
10146 core_pcbe_event_coverage() is missing an else
commit 542a7b7f5ccc44e3c95d6dce4ec0566f60bd9ff4
7780 mdb could extract NT_PRPSINFO information from core files
commit 2f7dba3e6747cbaaf1deb86e6ca1e2a5c96332ac
10524 wsdiff much slower after move from deprecated commands module
10448 wsdiff explodes on encoding error
10525 wsdiff output is not correct for a binary file
10526 wsdiff tries to spawn 4.8 threads
commit adee678425979226b2b55d1a0b39ce4c989382e9
9735 Need to provide SMB 2.1 Client
commit 40c0e2317898b8c774791bdc2b30bd50111ab1fa
9875 SMB client connection setup rework
commit 8329232e00f1048795bae53acb230316243aadb5
9874 Add fksmbcl development tool
Conflicts:
usr/src/cmd/mdb/common/modules/libc/libc.c
Diffstat (limited to 'usr/src/uts/common/sys/file.h')
| -rw-r--r-- | usr/src/uts/common/sys/file.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/usr/src/uts/common/sys/file.h b/usr/src/uts/common/sys/file.h index eb1328f38d..b0914cfb45 100644 --- a/usr/src/uts/common/sys/file.h +++ b/usr/src/uts/common/sys/file.h @@ -119,7 +119,7 @@ typedef struct fpollinfo { #define FCLOEXEC 0x800000 /* O_CLOEXEC = 0x800000 */ -#ifdef _KERNEL +#if defined(_KERNEL) || defined(_FAKE_KERNEL) /* * Fake flags for driver ioctl calls to inform them of the originating @@ -183,7 +183,7 @@ typedef struct fpollinfo { extern int flock(int, int); #endif -#if defined(_KERNEL) +#if defined(_KERNEL) || defined(_FAKE_KERNEL) /* * Routines dealing with user per-open file flags and @@ -192,15 +192,16 @@ extern int flock(int, int); struct proc; /* forward reference for function prototype */ struct vnodeops; struct vattr; +struct uf_info; extern file_t *getf(int); extern file_t *getf_gen(int, uf_entry_gen_t *); extern void releasef(int); -extern void areleasef(int, uf_info_t *); +extern void areleasef(int, struct uf_info *); #ifndef _BOOT -extern void closeall(uf_info_t *); +extern void closeall(struct uf_info *); #endif -extern void flist_fork(uf_info_t *, uf_info_t *); +extern void flist_fork(struct uf_info *, struct uf_info *); extern int closef(file_t *); extern int closeandsetf(int, file_t *); extern int ufalloc_file(int, file_t *); @@ -217,8 +218,8 @@ extern void f_setfd(int, char); extern int f_getfl(int, int *); extern int f_badfd(int, int *, int); extern int fassign(struct vnode **, int, int *); -extern void fcnt_add(uf_info_t *, int); -extern void close_exec(uf_info_t *); +extern void fcnt_add(struct uf_info *, int); +extern void close_exec(struct uf_info *); extern void clear_stale_fd(void); extern void clear_active_fd(int); extern void set_active_fd(int); |