X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Flustre_intent.h;h=be59853cf94a95a2bee92cecc3c76d5430860f1a;hb=7f72fee8c31abd37823386a4587fb5de937b7d3f;hp=39b5a9991dca6daad0d89168cad936bb34226a8c;hpb=8f0121ed09cf02dc12933bb3e880194b7ef0990e;p=fs%2Flustre-release.git

diff --git a/lustre/include/linux/lustre_intent.h b/lustre/include/linux/lustre_intent.h
index 39b5a99..be59853 100644
--- 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.
@@ -28,6 +26,8 @@
 /*
  * 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,15 +37,15 @@
 #ifndef LUSTRE_INTENT_H
 #define LUSTRE_INTENT_H
 
-#include <linux/lustre_version.h>
-
 /* 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 {