LU-3539 protocol: Change UPDATE_OBJ RPC format

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

diff --git a/lustre/include/linux/lustre_intent.h b/lustre/include/linux/lustre_intent.h
index be59853..588f211 100644 (file)
--- a/lustre/include/linux/lustre_intent.h
+++ b/lustre/include/linux/lustre_intent.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Whamcloud, Inc.
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -39,22 +39,24 @@
 
 /* intent IT_XXX are defined in lustre/include/obd.h */
 struct lustre_intent_data {
-        int             it_disposition;
-        int             it_status;
-        __u64           it_lock_handle;
-        __u64           it_lock_bits;
-        void           *it_data;
-        int             it_lock_mode;
-        unsigned int    it_lock_set:1;
+       int             it_disposition;
+       int             it_status;
+       __u64           it_lock_handle;
+       __u64           it_lock_bits;
+       int             it_lock_mode;
+       int             it_remote_lock_mode;
+       __u64           it_remote_lock_handle;
+       void           *it_data;
+       unsigned int    it_lock_set:1;
 };
 
 struct lookup_intent {
-        int     it_op;
-        int     it_flags;
+       int     it_op;
        int     it_create_mode;
-        union {
-                struct lustre_intent_data lustre;
-        } d;
+       __u64   it_flags;
+       union {
+               struct lustre_intent_data lustre;
+       } d;
 };
 
 #endif