- THIS BREAKS b_unify

  2.6.0 patches now fixed to Linus specs.  2.6.0 compiles, untested.
  beginning of similar changes for 2.4 changes

diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h
index 3609d52..c5f0b1a 100644 (file)
--- a/lustre/include/linux/lustre_compat25.h
+++ b/lustre/include/linux/lustre_compat25.h
@@ -36,11 +36,12 @@
 # define PGCACHE_WRUNLOCK(mapping)        write_unlock(&mapping->page_lock)
 
 #define KDEVT_INIT(val)                 { .value = val }
+
 #define LTIME_S(time)                   (time.tv_sec)
 #define USERMODEHELPER(path, argv, envp) \
                                         call_usermodehelper(path, argv, envp, 1)
 #define ll_path_lookup                  path_lookup
-
+#define ll_permission                   permission
 
 #define ll_pgcache_lock(mapping)          spin_lock(&mapping->page_lock)
 #define ll_pgcache_unlock(mapping)        spin_unlock(&mapping->page_lock)
@@ -78,6 +79,7 @@ static inline int ll_path_lookup(const char *path, unsigned flags,
                 error = path_walk(path, nd);
         return error;
 }
+#define ll_permission(a,b,c)  permission(a,b)
 typedef long sector_t;
 
 #define ll_pgcache_lock(mapping)        spin_lock(&pagecache_lock)