LU-3963 libcfs: convert lod, mdt, and gss to linux list api

[fs/lustre-release.git] / lustre / mdt / mdt_reint.c

diff --git a/lustre/mdt/mdt_reint.c b/lustre/mdt/mdt_reint.c
index 2f98026..063ddd3 100644 (file)
--- a/lustre/mdt/mdt_reint.c
+++ b/lustre/mdt/mdt_reint.c
@@ -708,7 +708,7 @@ static int mdt_reint_setattr(struct mdt_thread_info *info,
                 mfd->mfd_xid = req->rq_xid;
 
                spin_lock(&med->med_open_lock);
-               cfs_list_add(&mfd->mfd_list, &med->med_open_head);
+               list_add(&mfd->mfd_list, &med->med_open_head);
                spin_unlock(&med->med_open_lock);
                repbody->mbo_handle.cookie = mfd->mfd_handle.h_cookie;
         }
@@ -734,8 +734,8 @@ static int mdt_reint_setattr(struct mdt_thread_info *info,
                 LASSERT(mfd->mfd_mode == MDS_FMODE_SOM);
                 LASSERT(!(info->mti_ioepoch->flags & MF_EPOCH_CLOSE));
 
-                class_handle_unhash(&mfd->mfd_handle);
-                cfs_list_del_init(&mfd->mfd_list);
+               class_handle_unhash(&mfd->mfd_handle);
+               list_del_init(&mfd->mfd_list);
                spin_unlock(&med->med_open_lock);
 
                 mdt_mfd_close(info, mfd);
@@ -1423,7 +1423,7 @@ static int mdt_lock_objects_in_linkea(struct mdt_thread_info *info,
                        GOTO(out, rc);
                }
 
-               CFS_INIT_LIST_HEAD(&mll->mll_list);
+               INIT_LIST_HEAD(&mll->mll_list);
                mll->mll_obj = mdt_pobj;
                list_add_tail(&mll->mll_list, lock_list);
        }
@@ -1512,7 +1512,7 @@ static int mdt_reint_migrate_internal(struct mdt_thread_info *info,
                GOTO(out_put_child, rc);
 
        /* 3: iterate the linkea of the object and lock all of the objects */
-       CFS_INIT_LIST_HEAD(&lock_list);
+       INIT_LIST_HEAD(&lock_list);
        rc = mdt_lock_objects_in_linkea(info, mold, msrcdir, &lock_list);
        if (rc != 0)
                GOTO(out_put_child, rc);