b=19387 integrate LST into acc-sm

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

diff --git a/lustre/osd/osd_iam_lfix.c b/lustre/osd/osd_iam_lfix.c
index 22a60e2..defa760 100644 (file)
--- a/lustre/osd/osd_iam_lfix.c
+++ b/lustre/osd/osd_iam_lfix.c
@@ -41,9 +41,6 @@
  */
 
 #include <linux/types.h>
-#include <linux/jbd.h>
-/* ldiskfs_error() */
-#include <linux/ldiskfs_fs.h>
 #include "osd_internal.h"
 
 /*
@@ -187,7 +184,7 @@ static int iam_lfix_init(struct iam_leaf *l)
 
                 obj = iam_leaf_container(l)->ic_object;
                 CERROR("Wrong magic in node %llu (#%lu): %#x != %#x or "
-                       "wrong count: %i (%i)",
+                       "wrong count: %i (%i)\n",
                        (unsigned long long)l->il_bh->b_blocknr, obj->i_ino,
                        ill->ill_magic, le16_to_cpu(IAM_LEAF_HEADER_MAGIC),
                        count, leaf_count_limit(l));
@@ -249,7 +246,7 @@ static void l_print(struct iam_leaf *leaf, struct iam_lentry *entry)
         char h[3];
 
         area = (char *)entry;
-        printk(KERN_EMERG "[");
+        printk(CFS_KERN_EMERG "[");
         for (i = iam_lfix_key_size(leaf); i > 0; --i, ++area)
                 printk("%s", hex(*area, h));
         printk("]-(");
@@ -266,7 +263,7 @@ static void lfix_print(struct iam_leaf *leaf)
 
         entry = leaf->il_entries;
         count = lentry_count_get(leaf);
-        printk(KERN_EMERG "lfix: %p %p %d\n", leaf, leaf->il_at, count);
+        printk(CFS_KERN_EMERG "lfix: %p %p %d\n", leaf, leaf->il_at, count);
         for (i = 0; i < count; ++i, entry = iam_lfix_shift(leaf, entry, 1))
                 l_print(leaf, entry);
 }
@@ -749,10 +746,6 @@ struct lfix_leaf {
         memcpy(dst, &__val, sizeof(*(dst)));            \
 })
 
-#include <linux/jbd.h>
-#include <linux/ldiskfs_fs.h>
-#include <linux/ldiskfs_jbd.h>
-
 static void lfix_root(void *buf,
                       int blocksize, int keysize, int ptrsize, int recsize)
 {