LU-1756 kernel: cleanup lustre_compat25.h

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

diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h
index 1048874..93432b6 100644 (file)
--- a/lustre/include/liblustre.h
+++ b/lustre/include/liblustre.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,9 +26,8 @@
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
- */
-/*
- * Copyright (c) 2011 Whamcloud, Inc.
+ *
+ * Copyright (c) 2011, 2012, Whamcloud, Inc.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -68,10 +65,6 @@ typedef unsigned short cfs_umode_t;
 
 #endif
 
-/* always adopt 2.6.9 definitions */
-#define KERNEL_VERSION(a,b,c) ((a)*100+(b)*10+c)
-#define LINUX_VERSION_CODE KERNEL_VERSION(2,6,9)
-
 #ifndef page_private
 #define page_private(page) ((page)->private)
 #define set_page_private(page, v) ((page)->private = (v))
@@ -138,10 +131,6 @@ extern int echo_client_init(void);
 
 /* general stuff */
 
-#define EXPORT_SYMBOL(S)
-
-typedef __u64 kdev_t;
-
 #ifndef min
 #define min(x,y) ((x)<(y) ? (x) : (y))
 #endif
@@ -196,6 +185,7 @@ void cfs_get_random_bytes(void *ptr, int size);
 #define ATTR_BLOCKS     0x4000
 #define ATTR_KILL_SUID  0
 #define ATTR_KILL_SGID  0
+#define ATTR_FILE       0
 
 struct iattr {
         unsigned int    ia_valid;
@@ -209,8 +199,6 @@ struct iattr {
         unsigned int    ia_attr_flags;
 };
 
-#define ll_iattr iattr
-
 /* defined in kernel header include/linux/namei.h */
 #define INTENT_MAGIC 0x19620323
 
@@ -296,8 +284,6 @@ int cfs_curproc_is_in_groups(gid_t gid);
         ret;                                                            \
 }
 
-#define cfs_lock_kernel() do {} while (0)
-#define cfs_unlock_kernel() do {} while (0)
 #define daemonize(l) do {} while (0)
 #define sigfillset(l) do {} while (0)
 #define recalc_sigpending(l) do {} while (0)
@@ -434,35 +420,30 @@ typedef struct file_lock {
 
 /* quota */
 #define QUOTA_OK 0
-#define NO_QUOTA 1
+#define NO_QUOTA (-EDQUOT)
 
 /* ACL */
-struct posix_acl_entry {
-        short                   e_tag;
-        unsigned short          e_perm;
-        unsigned int            e_id;
-};
-
-struct posix_acl {
-        cfs_atomic_t            a_refcount;
-        unsigned int            a_count;
-        struct posix_acl_entry  a_entries[0];
-};
-
 typedef struct {
         __u16           e_tag;
         __u16           e_perm;
         __u32           e_id;
-} xattr_acl_entry;
+} posix_acl_xattr_entry;
+
+struct posix_acl {
+        cfs_atomic_t           a_refcount;
+        unsigned int           a_count;
+        posix_acl_xattr_entry  a_entries[0];
+};
 
 typedef struct {
-        __u32           a_version;
-        xattr_acl_entry a_entries[0];
-} xattr_acl_header;
+        __u32                 a_version;
+        posix_acl_xattr_entry a_entries[0];
+} posix_acl_xattr_header;
 
-static inline size_t xattr_acl_size(int count)
+static inline size_t posix_acl_xattr_size(int count)
 {
-        return sizeof(xattr_acl_header) + count * sizeof(xattr_acl_entry);
+        return sizeof(posix_acl_xattr_header) + count *
+               sizeof(posix_acl_xattr_entry);
 }
 
 static inline
@@ -482,19 +463,8 @@ void posix_acl_release(struct posix_acl *acl)
 {
 }
 
-#ifdef LIBLUSTRE_POSIX_ACL
-# ifndef posix_acl_xattr_entry
-#  define posix_acl_xattr_entry xattr_acl_entry
-# endif
-# ifndef posix_acl_xattr_header
-#  define posix_acl_xattr_header xattr_acl_header
-# endif
-# ifndef posix_acl_xattr_size
-#  define posix_acl_xattr_size(entry) xattr_acl_size(entry)
-# endif
-# ifndef CONFIG_FS_POSIX_ACL
-#  define CONFIG_FS_POSIX_ACL 1
-# endif
+#if defined(LIBLUSTRE_POSIX_ACL) && !defined(CONFIG_FS_POSIX_ACL)
+# define CONFIG_FS_POSIX_ACL 1
 #endif
 
 #ifndef ENOTSUPP