xnu-3248.60.10.tar.gz

[apple/xnu.git] / bsd / sys / file.h

diff --git a/bsd/sys/file.h b/bsd/sys/file.h
index 9bf925acb8f25d60e362d80769d100fb3a70e980..dcf08f44814f7f74f64c87c5682e406e3a2eddf5 100644 (file)
--- a/bsd/sys/file.h
+++ b/bsd/sys/file.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2008 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -74,39 +74,29 @@
 #ifdef KERNEL
 #include <sys/queue.h>
 #include <sys/kernel_types.h>
+#include <sys/uio.h>
 #endif
 
 #ifndef _KAUTH_CRED_T
 #define        _KAUTH_CRED_T
 struct ucred;
 typedef struct ucred *kauth_cred_t;
+struct posix_cred;
+typedef struct posix_cred *posix_cred_t;
 #endif /* !_KAUTH_CRED_T */
 
-#pragma pack(4)
-
-/* for the compat sake;  */
-struct extern_file {
-       LIST_ENTRY(extern_file) f_list; /* list of active files */
-       short   f_flag;         /* see fcntl.h */
-       short   f_type;         /* descriptor type */
-       short   f_count;        /* reference count */
-       short   f_msgcount;     /* references from message queue */
-       kauth_cred_t f_cred;    /* credentials associated with descriptor */
-       void * f_ops;
-       off_t   f_offset;
-       caddr_t f_data;         /* vnode or socket or SHM or semaphore */
-};
-
-#pragma pack()
-
-#ifdef KERNEL
 __BEGIN_DECLS
+#ifdef KERNEL
 int file_socket(int, socket_t *);
 int file_vnode(int, vnode_t *);
+int file_vnode_withvid(int, vnode_t *, uint32_t *);
 int file_flags(int, int *);
 int file_drop(int);
-__END_DECLS
-
 #endif /* KERNEL */
 
+#ifdef KERNEL_PRIVATE
+int fd_rdwr(int fd, enum uio_rw, uint64_t base, int64_t len, enum uio_seg,
+           off_t offset, int io_flg, int64_t *aresid);
+#endif /* KERNEL_PRIVATE */
+__END_DECLS
 #endif /* !_SYS_FILE_H_ */