New release 2.15.64

[fs/lustre-release.git] / lustre / include / lustre_intent.h

diff --git a/lustre/include/lustre_intent.h b/lustre/include/lustre_intent.h
index a8eac3f..96ad670 100644 (file)
--- a/lustre/include/lustre_intent.h
+++ b/lustre/include/lustre_intent.h
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,11 +23,10 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #ifndef LUSTRE_INTENT_H
@@ -42,7 +37,7 @@
 struct lookup_intent {
        int                      it_op;
        int                      it_create_mode;
-       __u64                    it_flags;
+       enum mds_open_flags      it_open_flags;
        int                      it_disposition;
        int                      it_status;
        __u64                    it_lock_handle;
@@ -50,7 +45,7 @@ struct lookup_intent {
        int                      it_lock_mode;
        int                      it_remote_lock_mode;
        __u64                    it_remote_lock_handle;
-       void                    *it_data;
+       struct ptlrpc_request   *it_request;
        unsigned int             it_lock_set:1;
 };