LU-1330 obdclass: add obd_target.h

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

diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h
index b93d805..cf41790 100644 (file)
--- a/lustre/include/liblustre.h
+++ b/lustre/include/liblustre.h
@@ -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 */
@@ -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)
 {