LU-549 llite: Improve statfs performance if selinux is disabled

[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 8470701..17cf395 100644 (file)
--- a/lustre/include/linux/lustre_intent.h
+++ b/lustre/include/linux/lustre_intent.h
@@ -26,8 +26,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/
@@ -39,23 +41,15 @@
 
 #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 +62,3 @@ struct lookup_intent {
 };
 
 #endif
-#endif