b=20989 Don't search for inode in nfs get_dentry

[fs/lustre-release.git] / lustre / osd / osd_iam_lvar.c

diff --git a/lustre/osd/osd_iam_lvar.c b/lustre/osd/osd_iam_lvar.c
index 49a77d7..e3a4224 100644 (file)
--- a/lustre/osd/osd_iam_lvar.c
+++ b/lustre/osd/osd_iam_lvar.c
@@ -41,9 +41,6 @@
  */
 
 #include <linux/types.h>
-#include <linux/jbd.h>
-/* ldiskfs_error() */
-#include <linux/ldiskfs_fs.h>
 #include "osd_internal.h"
 
 /*
@@ -202,10 +199,7 @@ static __u32 hash_build0(const char *name, int namelen)
         } else {
                 struct ldiskfs_dx_hash_info hinfo;
 
-                if (LVAR_HASH_TEA)
-                        hinfo.hash_version = LDISKFS_DX_HASH_TEA;
-                else
-                        hinfo.hash_version = LDISKFS_DX_HASH_R5;
+                hinfo.hash_version = LDISKFS_DX_HASH_TEA;
                 hinfo.seed = 0;
                 ldiskfsfs_dirhash(name, namelen, &hinfo);
                 result = hinfo.hash;
@@ -297,7 +291,7 @@ void n_print(const struct iam_leaf *l)
 {
         struct lvar_leaf_entry *scan;
 
-        printk(KERN_EMERG "used: %d\n", h_used(n_head(l)));
+        printk(CFS_KERN_EMERG "used: %d\n", h_used(n_head(l)));
         for (scan = n_start(l); scan < n_end(l); scan = e_next(l, scan))
                 e_print(scan);
 }
@@ -981,10 +975,6 @@ static void lvar_leaf(void *buf,
         *(char *)e_rec(entry) = recsize;
 }
 
-#include <linux/jbd.h>
-#include <linux/ldiskfs_fs.h>
-#include <linux/ldiskfs_jbd.h>
-
 int iam_lvar_create(struct inode *obj,
                     int keysize, int ptrsize, int recsize, handle_t *handle)
 {