Simplify the upgrade path handling from PPA.

[deb_libnfs.git] / nlm / nlm.x

diff --git a/nlm/nlm.x b/nlm/nlm.x
index 19fe65dfbeb607168eab190365c5406edc9af4a1..072aa99321b7f24453e2977a4a388e8059341572 100644 (file)
--- a/nlm/nlm.x
+++ b/nlm/nlm.x
@@ -1,5 +1,31 @@
-/* based on rfc1813 and wireshark */
-
+/*
+Copyright (c) 2014, Ronnie Sahlberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer. 
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies, 
+either expressed or implied, of the FreeBSD Project.
+*/
 
 struct nlm_fh4 {
        opaque       data<>;
@@ -28,8 +54,8 @@ struct nlm4_holder {
        bool           exclusive;
        unsigned int   svid;
        nlm4_oh        oh;
-       unsigned hyper l_offset;
-       unsigned hyper l_len;
+       uint64_t       l_offset;
+       uint64_t       l_len;
 };
 
 const NLM_MAXNAME = 256;
@@ -38,8 +64,8 @@ struct nlm4_lock {
        struct nlm_fh4 fh;
        nlm4_oh        oh;
        unsigned int   svid;
-       unsigned hyper l_offset;
-       unsigned hyper l_len;
+       uint64_t       l_offset;
+       uint64_t       l_len;
 };
 
 struct nlm4_share {
@@ -94,6 +120,31 @@ struct NLM4_UNLOCKargs {
        nlm4_lock  lock;
 };
 
+struct NLM4_LOCKres {
+       nlm_cookie cookie;
+       nlmstat4 status;
+};
+
+struct NLM4_LOCKargs {
+       nlm_cookie cookie;
+       bool block;
+       bool exclusive;
+       nlm4_lock  lock;
+       bool reclaim;
+       int state;
+};
+
+struct NLM4_GRANTEDargs {
+       nlm_cookie cookie;
+       bool       exclusive;
+       nlm4_lock  lock;
+};
+
+struct NLM4_GRANTEDres {
+       nlm_cookie cookie;
+       nlmstat4 status;
+};
+
 program NLM_PROGRAM {
        version NLM_V4 {
                void
@@ -102,8 +153,8 @@ program NLM_PROGRAM {
                NLM4_TESTres
                NLM4_TEST(NLM4_TESTargs)         = 1;
 
-/*             nlm4_res                         */
-/*             NLM4_LOCK(nlm4_lockargs)         = 2;   */
+               NLM4_LOCKres
+               NLM4_LOCK(NLM4_LOCKargs)         = 2;
 
                NLM4_CANCres
                NLM4_CANCEL(NLM4_CANCargs)       = 3;
@@ -111,14 +162,14 @@ program NLM_PROGRAM {
                NLM4_UNLOCKres
                NLM4_UNLOCK(NLM4_UNLOCKargs)     = 4;
 
-/*             nlm4_res                         */
-/*             NLM4_GRANTED(nlm4_testargs)      = 5;   */
+               NLM4_GRANTEDres
+               NLM4_GRANT(NLM4_GRANTEDargs)      = 5;
 
                void
                NLM4_TEST_MSG(NLM4_TESTargs)     = 6;
 
-/*             void                             */
-/*             NLM4_LOCK_MSG(nlm4_lockargs)     = 7;   */
+               void
+               NLM4_LOCK_MSG(NLM4_LOCKargs)     = 7;
 
                void
                NLM4_CANCEL_MSG(NLM4_CANCargs)   = 8;
@@ -126,14 +177,14 @@ program NLM_PROGRAM {
                void
                NLM4_UNLOCK_MSG(NLM4_UNLOCKargs) = 9;
 
-/*             void                             */
-/*             NLM4_GRANTED_MSG(nlm4_testargs) = 10;   */
+               void
+               NLM4_GRANT_MSG(NLM4_GRANTEDargs) = 10;
 
                void
                NLM4_TEST_RES(NLM4_TESTres)     = 11;
 
-/*             void                            */
-/*             NLM4_LOCK_RES(nlm4_res)         = 12;   */
+               void
+               NLM4_LOCK_RES(NLM4_LOCKres)         = 12;
 
                void
                NLM4_CANCEL_RES(NLM4_CANCres)       = 13;
@@ -141,8 +192,8 @@ program NLM_PROGRAM {
                void
                NLM4_UNLOCK_RES(NLM4_UNLOCKres)       = 14;
 
-/*             void                            */
-/*             NLM4_GRANTED_RES(nlm4_res)      = 15;   */
+               void
+               NLM4_GRANT_RES(NLM4_GRANTEDres)      = 15;
 
 /*             nlm4_shareres                   */
 /*             NLM4_SHARE(nlm4_shareargs)      = 20;   */