LU-1201 checksum: add libcfs crypto hash

[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 3327117..be59853 100644 (file)
--- a/lustre/include/linux/lustre_intent.h
+++ b/lustre/include/linux/lustre_intent.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -16,8 +14,8 @@
  * 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 [sun.com URL with a
- * copy of GPLv2].
+ * 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
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * 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/
@@ -37,25 +37,15 @@
 #ifndef LUSTRE_INTENT_H
 #define LUSTRE_INTENT_H
 
-#include <linux/lustre_version.h>
-
-#ifndef HAVE_VFS_INTENT_PATCHES
-
-#define IT_OPEN     (1 << 0)
-#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 {
@@ -68,4 +58,3 @@ struct lookup_intent {
 };
 
 #endif
-#endif