b=19387 integrate LST into acc-sm

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

diff --git a/lustre/osd/osd_iam.c b/lustre/osd/osd_iam.c
index 9f1cd26..ab036a2 100644 (file)
--- a/lustre/osd/osd_iam.c
+++ b/lustre/osd/osd_iam.c
@@ -106,10 +106,7 @@
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/pagemap.h>
-#include <linux/jbd.h>
 #include <linux/time.h>
-#include <linux/ldiskfs_fs.h>
-#include <linux/ldiskfs_jbd.h>
 #include <linux/fcntl.h>
 #include <linux/stat.h>
 #include <linux/string.h>
@@ -127,11 +124,11 @@
  *
  * No locking. Callers synchronize.
  */
-static LIST_HEAD(iam_formats);
+static CFS_LIST_HEAD(iam_formats);
 
 void iam_format_register(struct iam_format *fmt)
 {
-        list_add(&fmt->if_linkage, &iam_formats);
+        cfs_list_add(&fmt->if_linkage, &iam_formats);
 }
 EXPORT_SYMBOL(iam_format_register);
 
@@ -158,7 +155,7 @@ static int iam_format_guess(struct iam_container *c)
         }
 
         result = -ENOENT;
-        list_for_each_entry(fmt, &iam_formats, if_linkage) {
+        cfs_list_for_each_entry(fmt, &iam_formats, if_linkage) {
                 result = fmt->if_guess(c);
                 if (result == 0)
                         break;
@@ -175,7 +172,7 @@ int iam_container_init(struct iam_container *c,
         memset(c, 0, sizeof *c);
         c->ic_descr  = descr;
         c->ic_object = inode;
-        init_rwsem(&c->ic_sem);
+        cfs_init_rwsem(&c->ic_sem);
         return 0;
 }
 EXPORT_SYMBOL(iam_container_init);
@@ -367,7 +364,7 @@ static int iam_leaf_load(struct iam_path *path)
         block = path->ip_frame->leaf;
         if (block == 0) {
                 /* XXX bug 11027 */
-                printk(KERN_EMERG "wrong leaf: %lu %d [%p %p %p]\n",
+                printk(CFS_KERN_EMERG "wrong leaf: %lu %d [%p %p %p]\n",
                        (long unsigned)path->ip_frame->leaf,
                        dx_get_count(dx_node_get_entries(path, path->ip_frame)),
                        path->ip_frames[0].bh, path->ip_frames[1].bh,
@@ -584,22 +581,22 @@ static int iam_it_get_exact(struct iam_iterator *it, const struct iam_key *k)
 
 void iam_container_write_lock(struct iam_container *ic)
 {
-        down_write(&ic->ic_sem);
+        cfs_down_write(&ic->ic_sem);
 }
 
 void iam_container_write_unlock(struct iam_container *ic)
 {
-        up_write(&ic->ic_sem);
+        cfs_up_write(&ic->ic_sem);
 }
 
 void iam_container_read_lock(struct iam_container *ic)
 {
-        down_read(&ic->ic_sem);
+        cfs_down_read(&ic->ic_sem);
 }
 
 void iam_container_read_unlock(struct iam_container *ic)
 {
-        up_read(&ic->ic_sem);
+        cfs_up_read(&ic->ic_sem);
 }
 
 /*