X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Flustre_intent.h;h=be59853cf94a95a2bee92cecc3c76d5430860f1a;hb=353e3c2f8d9f195c0f87a16259f22b2f84de11d4;hp=3d8cb2c185378bf3e040a743a38bf6a996add264;hpb=113303973ec9f8484eb2355a1a6ef3c4c7fd6a56;p=fs%2Flustre-release.git

diff --git a/lustre/include/linux/lustre_intent.h b/lustre/include/linux/lustre_intent.h
index 3d8cb2c..be59853 100644
--- a/lustre/include/linux/lustre_intent.h
+++ b/lustre/include/linux/lustre_intent.h
@@ -1,24 +1,51 @@
+/*
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * 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.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ */
+
 #ifndef LUSTRE_INTENT_H
 #define LUSTRE_INTENT_H
 
-#include <linux/lustre_version.h>
-
-#ifndef LUSTRE_KERNEL_VERSION
-#define IT_OPEN     (1)
-#define IT_CREAT    (1<<1)
-#define IT_READDIR  (1<<2)
-#define IT_GETATTR  (1<<3)
-#define IT_LOOKUP   (1<<4)
-#define IT_UNLINK   (1<<5)
-#define IT_TRUNC    (1<<6)
-#define IT_GETXATTR (1<<7)
-
+/* intent IT_XXX are defined in lustre/include/obd.h */
 struct lustre_intent_data {
-        int       it_disposition;
-        int       it_status;
-        __u64     it_lock_handle;
-        void     *it_data;
-        int       it_lock_mode;
+        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;
 };
 
 struct lookup_intent {
@@ -30,6 +57,4 @@ struct lookup_intent {
         } d;
 };
 
-
-#endif
 #endif