LU-3677 mdt: Set HSM dirty open-for-write file when evicted.

[fs/lustre-release.git] / lustre / include / liblustre.h

diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h
index 14f3ef6..1cf77fc 100644 (file)
--- a/lustre/include/liblustre.h
+++ b/lustre/include/liblustre.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -163,8 +163,8 @@ void cfs_get_random_bytes(void *ptr, int size);
 /* memory */
 
 /* memory size: used for some client tunables */
-#define cfs_num_physpages  (256 * 1024) /* 1GB */
-#define CFS_NUM_CACHEPAGES cfs_num_physpages
+#define num_physpages  (256 * 1024) /* 1GB */
+#define NUM_CACHEPAGES num_physpages
 
 
 /* VFS stuff */
@@ -215,14 +215,14 @@ struct lustre_intent_data {
 };
 
 struct lookup_intent {
-        int     it_magic;
-        void    (*it_op_release)(struct lookup_intent *);
-        int     it_op;
-        int     it_flags;
-        int     it_create_mode;
-        union {
-                struct lustre_intent_data lustre;
-        } d;
+       int     it_magic;
+       void    (*it_op_release)(struct lookup_intent *);
+       int     it_op;
+       int     it_create_mode;
+       __u64   it_flags;
+       union {
+               struct lustre_intent_data lustre;
+       } d;
 };
 
 static inline void intent_init(struct lookup_intent *it, int op, int flags)
@@ -458,6 +458,10 @@ struct posix_acl * posix_acl_from_xattr(const void *value, size_t size)
         return NULL;
 }
 
+/* The kernel version takes 3 arguments, so strip that off first. */
+#define posix_acl_from_xattr(a,b,c)    posix_acl_from_xattr(b,c)
+#define posix_acl_to_xattr(a,b,c)      posix_acl_to_xattr(b,c)
+
 static inline
 int posix_acl_valid(const struct posix_acl *acl)
 {