d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move FMARK and FDEFER til sys/file.h where they belong.

Browse Source 
Order the fields in struct file in sections after their scope.
This commit is contained in:
phk 2003-06-20 07:59:59 +00:00
parent a63ecc149e
commit aca3c4a9f0
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/sys/fcntl.h
View File

@ -107,9 +107,6 @@ typedef __pid_t pid_t;
#define O_TRUNC 0x0400 /* truncate to zero length */
#define O_EXCL 0x0800 /* error if already exists */
#ifdef _KERNEL
/* FMARK/FDEFER kept in f_gcflags */
#define FMARK 0x1 /* mark during gc() */
#define FDEFER 0x2 /* defer for next gc pass */
#define FHASLOCK 0x4000 /* descriptor holds advisory lock */
#endif

24
sys/sys/file.h
View File

@ -109,12 +109,24 @@ struct fileops {
struct file {
LIST_ENTRY(file) f_list;/* (fl) list of active files */
short f_gcflag; /* used by thread doing fd garbage collection */
short f_type; /* descriptor type */
int f_count; /* (f) reference count */
int f_msgcount; /* (f) references from message queue */
struct ucred *f_cred; /* credentials associated with descriptor */
void *f_data; /* file descriptor specific data */
u_int f_flag; /* see fcntl.h */
struct mtx *f_mtxp; /* mutex to protect data */
struct fileops *f_ops; /* File operations */
struct ucred *f_cred; /* credentials associated with descriptor */
int f_count; /* (f) reference count */
/* DFLAG_SEEKABLE specific fields */
off_t f_offset;
/* DTYPE_SOCKET specific fields */
short f_gcflag; /* used by thread doing fd garbage collection */
#define FMARK 0x1 /* mark during gc() */
#define FDEFER 0x2 /* defer for next gc pass */
int f_msgcount; /* (f) references from message queue */
/* DTYPE_VNODE specific fields */
int f_seqcount; /*
* count of sequential accesses -- cleared
* by most seek operations.
@ -122,10 +134,6 @@ struct file {
off_t f_nextoff; /*
* offset of next expected read or write
*/
off_t f_offset;
void *f_data; /* file descriptor specific data */
u_int f_flag; /* see fcntl.h */
struct mtx *f_mtxp; /* mutex to protect data */
};
#endif /* _KERNEL */