Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-8648 all: remove all Sun license and URL references
[fs/lustre-release.git]
/
lustre
/
include
/
lustre_intent.h
diff --git
a/lustre/include/lustre_intent.h
b/lustre/include/lustre_intent.h
index
577345b
..
65e1e6c
100644
(file)
--- a/
lustre/include/lustre_intent.h
+++ b/
lustre/include/lustre_intent.h
@@
-15,11
+15,7
@@
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
*
* 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.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
*
* GPL HEADER END
*/
@@
-38,40
+34,35
@@
#define LUSTRE_INTENT_H
/* intent IT_XXX are defined in lustre/include/obd.h */
#define LUSTRE_INTENT_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;
- __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 {
struct lookup_intent {
- int it_op;
- int it_create_mode;
- __u64 it_flags;
- union {
- struct lustre_intent_data lustre;
- } d;
+ int it_op;
+ int it_create_mode;
+ __u64 it_flags;
+ 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;
+ struct ptlrpc_request *it_request;
+ unsigned int it_lock_set:1;
};
static inline int it_disposition(const struct lookup_intent *it, int flag)
{
};
static inline int it_disposition(const struct lookup_intent *it, int flag)
{
- return it->
d.lustre.
it_disposition & flag;
+ return it->it_disposition & flag;
}
static inline void it_set_disposition(struct lookup_intent *it, int flag)
{
}
static inline void it_set_disposition(struct lookup_intent *it, int flag)
{
- it->
d.lustre.
it_disposition |= flag;
+ it->it_disposition |= flag;
}
static inline void it_clear_disposition(struct lookup_intent *it, int flag)
{
}
static inline void it_clear_disposition(struct lookup_intent *it, int flag)
{
- it->
d.lustre.
it_disposition &= ~flag;
+ it->it_disposition &= ~flag;
}
#endif
}
#endif