xnu-1504.3.12.tar.gz

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

diff --git a/bsd/sys/lockf.h b/bsd/sys/lockf.h
index 284299c9ce1a15722ac8b7eb8df23e7dcbb16482..ffa77957356febb00624fe6d29dac5ba3b1b6b08 100644 (file)
--- a/bsd/sys/lockf.h
+++ b/bsd/sys/lockf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -76,14 +76,13 @@ MALLOC_DECLARE(M_LOCKF);
 /*
  * The lockf structure is a kernel structure which contains the information
  * associated with a byte range lock.  The lockf structures are linked into
- * the inode structure. Locks are sorted by the starting byte of the lock for
- * efficiency.
+ * the vnode structure.  Locks are sorted by the starting byte of the lock for
+ * efficiency after they have been committed; uncommitted locks are on the list
+ * head so they may quickly be accessed, and are both short lived and transient.
  */
 TAILQ_HEAD(locklist, lockf);
 
-#if __DARWIN_ALIGN_POWER
-#pragma options align=power
-#endif
+#pragma pack(4)
 
 struct lockf {
        short   lf_flags;           /* Semantics: F_POSIX, F_FLOCK, F_WAIT */
@@ -98,21 +97,23 @@ struct lockf {
        TAILQ_ENTRY(lockf) lf_block;/* A request waiting for a lock */
 };
 
-#if __DARWIN_ALIGN_POWER
-#pragma options align=reset
-#endif
+#pragma pack()
 
 /* Maximum length of sleep chains to traverse to try and detect deadlock. */
 #define MAXDEPTH 50
 
 __BEGIN_DECLS
 
-int     lf_advlock(struct vnop_advlock_args *);
+#ifdef KERNEL_PRIVATE
+int    lf_advlock(struct vnop_advlock_args *);
+int    lf_assert(struct vnop_advlock_args *, void **);
+void   lf_commit(void *, int);
 
 #ifdef LOCKF_DEBUG
 void   lf_print(char *, struct lockf *);
 void   lf_printlist(char *, struct lockf *);
 #endif
+#endif /* KERNEL_PRIVATE */
 
 __END_DECLS