LU-3963 ptlrpc: convert to linux list api

[fs/lustre-release.git] / lustre / osd-ldiskfs / osd_compat.c

diff --git a/lustre/osd-ldiskfs/osd_compat.c b/lustre/osd-ldiskfs/osd_compat.c
index e693e8d..de373e5 100644 (file)
--- a/lustre/osd-ldiskfs/osd_compat.c
+++ b/lustre/osd-ldiskfs/osd_compat.c
@@ -66,6 +66,8 @@ static void osd_push_ctxt(const struct osd_device *dev,
        newctxt->pwdmnt = dev->od_mnt;
        newctxt->pwd = dev->od_mnt->mnt_root;
        newctxt->fs = get_ds();
+       newctxt->umask = current_umask();
+       newctxt->dt = NULL;
 
        push_ctxt(save, newctxt);
 }
@@ -375,9 +377,9 @@ static int osd_ost_init(const struct lu_env *env, struct osd_device *dev)
        dev->od_ost_map->om_subdir_count = rc;
         rc = 0;
 
-       CFS_INIT_LIST_HEAD(&dev->od_ost_map->om_seq_list);
+       INIT_LIST_HEAD(&dev->od_ost_map->om_seq_list);
        rwlock_init(&dev->od_ost_map->om_seq_list_lock);
-       sema_init(&dev->od_ost_map->om_dir_init_sem, 1);
+       mutex_init(&dev->od_ost_map->om_dir_init_mutex);
 
         osd_push_ctxt(dev, &new, &save);
 
@@ -422,7 +424,7 @@ static void osd_seq_free(struct osd_obj_map *map,
 {
        int j;
 
-       cfs_list_del_init(&osd_seq->oos_seq_list);
+       list_del_init(&osd_seq->oos_seq_list);
 
        if (osd_seq->oos_dirs) {
                for (j = 0; j < osd_seq->oos_subdir_count; j++) {
@@ -450,9 +452,8 @@ static void osd_ost_fini(struct osd_device *osd)
                return;
 
        write_lock(&map->om_seq_list_lock);
-       cfs_list_for_each_entry_safe(osd_seq, tmp,
-                                    &map->om_seq_list,
-                                    oos_seq_list) {
+       list_for_each_entry_safe(osd_seq, tmp, &map->om_seq_list,
+                                oos_seq_list) {
                osd_seq_free(map, osd_seq);
        }
        write_unlock(&map->om_seq_list_lock);
@@ -483,7 +484,7 @@ struct osd_obj_seq *osd_seq_find_locked(struct osd_obj_map *map, obd_seq seq)
 {
        struct osd_obj_seq *osd_seq;
 
-       cfs_list_for_each_entry(osd_seq, &map->om_seq_list, oos_seq_list) {
+       list_for_each_entry(osd_seq, &map->om_seq_list, oos_seq_list) {
                if (osd_seq->oos_seq == seq)
                        return osd_seq;
        }
@@ -813,7 +814,7 @@ static struct osd_obj_seq *osd_seq_load(struct osd_thread_info *info,
                RETURN(osd_seq);
 
        /* Serializing init process */
-       down(&map->om_dir_init_sem);
+       mutex_lock(&map->om_dir_init_mutex);
 
        /* Check whether the seq has been added */
        read_lock(&map->om_seq_list_lock);
@@ -828,7 +829,7 @@ static struct osd_obj_seq *osd_seq_load(struct osd_thread_info *info,
        if (osd_seq == NULL)
                GOTO(cleanup, rc = -ENOMEM);
 
-       CFS_INIT_LIST_HEAD(&osd_seq->oos_seq_list);
+       INIT_LIST_HEAD(&osd_seq->oos_seq_list);
        osd_seq->oos_seq = seq;
        /* Init subdir count to be 32, but each seq can have
         * different subdir count */
@@ -838,11 +839,11 @@ static struct osd_obj_seq *osd_seq_load(struct osd_thread_info *info,
                GOTO(cleanup, rc);
 
        write_lock(&map->om_seq_list_lock);
-       cfs_list_add(&osd_seq->oos_seq_list, &map->om_seq_list);
+       list_add(&osd_seq->oos_seq_list, &map->om_seq_list);
        write_unlock(&map->om_seq_list_lock);
 
 cleanup:
-       up(&map->om_dir_init_sem);
+       mutex_unlock(&map->om_dir_init_mutex);
        if (rc != 0) {
                if (osd_seq != NULL)
                        OBD_FREE_PTR(osd_seq);
@@ -1104,7 +1105,7 @@ int osd_obj_map_recover(struct osd_thread_info *info,
                /* If the src object has never been modified, then remove it. */
                if (inode->i_size == 0 && inode->i_mode & S_ISUID &&
                    inode->i_mode & S_ISGID) {
-                       rc = vfs_unlink(src_parent, src_child);
+                       rc = ll_vfs_unlink(src_parent, src_child);
                        if (unlikely(rc == -ENOENT))
                                rc = 0;
                }
@@ -1164,7 +1165,7 @@ int osd_obj_spec_update(struct osd_thread_info *info, struct osd_device *osd,
                        handle_t *th)
 {
        struct dentry   *root;
-       char            *name;
+       char            *name = NULL;
        int              rc;
        ENTRY;
 
@@ -1185,7 +1186,7 @@ int osd_obj_spec_insert(struct osd_thread_info *info, struct osd_device *osd,
                        handle_t *th)
 {
        struct dentry   *root;
-       char            *name;
+       char            *name = NULL;
        int              rc;
        ENTRY;
 
@@ -1207,7 +1208,7 @@ int osd_obj_spec_lookup(struct osd_thread_info *info, struct osd_device *osd,
        struct dentry   *root;
        struct dentry   *dentry;
        struct inode    *inode;
-       char            *name;
+       char            *name = NULL;
        int             rc = -ENOENT;
        ENTRY;