LU-5047 tests: correct cleanup files in sanity.sh

[fs/lustre-release.git] / lustre / ofd / ofd_fs.c

diff --git a/lustre/ofd/ofd_fs.c b/lustre/ofd/ofd_fs.c
index ba0cd9f..fa32ed8 100644 (file)
--- a/lustre/ofd/ofd_fs.c
+++ b/lustre/ofd/ofd_fs.c
@@ -57,7 +57,7 @@ int ofd_record_write(const struct lu_env *env, struct ofd_device *ofd,
        if (IS_ERR(th))
                RETURN(PTR_ERR(th));
 
-       rc = dt_declare_record_write(env, dt, buf->lb_len, *off, th);
+       rc = dt_declare_record_write(env, dt, buf, *off, th);
        if (rc == 0) {
                rc = dt_trans_start_local(env, ofd->ofd_osd, th);
                if (rc == 0)
@@ -86,7 +86,7 @@ struct ofd_seq *ofd_seq_get(struct ofd_device *ofd, obd_seq seq)
        read_lock(&ofd->ofd_seq_list_lock);
        cfs_list_for_each_entry(oseq, &ofd->ofd_seq_list, os_list) {
                if (ostid_seq(&oseq->os_oi) == seq) {
-                       cfs_atomic_inc(&oseq->os_refc);
+                       atomic_inc(&oseq->os_refc);
                        read_unlock(&ofd->ofd_seq_list_lock);
                        return oseq;
                }
@@ -106,7 +106,7 @@ static void ofd_seq_destroy(const struct lu_env *env,
 
 void ofd_seq_put(const struct lu_env *env, struct ofd_seq *oseq)
 {
-       if (cfs_atomic_dec_and_test(&oseq->os_refc))
+       if (atomic_dec_and_test(&oseq->os_refc))
                ofd_seq_destroy(env, oseq);
 }
 
@@ -133,14 +133,14 @@ static struct ofd_seq *ofd_seq_add(const struct lu_env *env,
        write_lock(&ofd->ofd_seq_list_lock);
        cfs_list_for_each_entry(os, &ofd->ofd_seq_list, os_list) {
                if (ostid_seq(&os->os_oi) == ostid_seq(&new_seq->os_oi)) {
-                       cfs_atomic_inc(&os->os_refc);
+                       atomic_inc(&os->os_refc);
                        write_unlock(&ofd->ofd_seq_list_lock);
                        /* The seq has not been added to the list */
                        ofd_seq_put(env, new_seq);
                        return os;
                }
        }
-       cfs_atomic_inc(&new_seq->os_refc);
+       atomic_inc(&new_seq->os_refc);
        cfs_list_add_tail(&new_seq->os_list, &ofd->ofd_seq_list);
        ofd->ofd_seq_count++;
        write_unlock(&ofd->ofd_seq_list_lock);
@@ -220,22 +220,11 @@ static int ofd_fld_fini(const struct lu_env *env,
        RETURN(0);
 }
 
-void ofd_seqs_fini(const struct lu_env *env, struct ofd_device *ofd)
+void ofd_seqs_free(const struct lu_env *env, struct ofd_device *ofd)
 {
        struct ofd_seq  *oseq;
        struct ofd_seq  *tmp;
        cfs_list_t       dispose;
-       int             rc;
-
-       ofd_deregister_seq_exp(ofd);
-
-       rc = ofd_fid_fini(env, ofd);
-       if (rc != 0)
-               CERROR("%s: fid fini error: rc = %d\n", ofd_name(ofd), rc);
-
-       rc = ofd_fld_fini(env, ofd);
-       if (rc != 0)
-               CERROR("%s: fld fini error: rc = %d\n", ofd_name(ofd), rc);
 
        CFS_INIT_LIST_HEAD(&dispose);
        write_lock(&ofd->ofd_seq_list_lock);
@@ -248,9 +237,25 @@ void ofd_seqs_fini(const struct lu_env *env, struct ofd_device *ofd)
                oseq = container_of0(dispose.next, struct ofd_seq, os_list);
                ofd_seq_delete(env, oseq);
        }
+}
+
+void ofd_seqs_fini(const struct lu_env *env, struct ofd_device *ofd)
+{
+       int rc;
+
+       ofd_deregister_seq_exp(ofd);
+
+       rc = ofd_fid_fini(env, ofd);
+       if (rc != 0)
+               CERROR("%s: fid fini error: rc = %d\n", ofd_name(ofd), rc);
+
+       rc = ofd_fld_fini(env, ofd);
+       if (rc != 0)
+               CERROR("%s: fld fini error: rc = %d\n", ofd_name(ofd), rc);
+
+       ofd_seqs_free(env, ofd);
 
        LASSERT(cfs_list_empty(&ofd->ofd_seq_list));
-       return;
 }
 
 /**
@@ -277,7 +282,7 @@ struct ofd_seq *ofd_seq_load(const struct lu_env *env, struct ofd_device *ofd,
        if (oseq == NULL)
                RETURN(ERR_PTR(-ENOMEM));
 
-       lu_last_id_fid(&info->fti_fid, seq);
+       lu_last_id_fid(&info->fti_fid, seq, ofd->ofd_lut.lut_lsd.lsd_osd_index);
        memset(&info->fti_attr, 0, sizeof(info->fti_attr));
        info->fti_attr.la_valid = LA_MODE;
        info->fti_attr.la_mode = S_IFREG |  S_IRUGO | S_IWUSR;
@@ -299,7 +304,7 @@ struct ofd_seq *ofd_seq_load(const struct lu_env *env, struct ofd_device *ofd,
        spin_lock_init(&oseq->os_last_oid_lock);
        ostid_set_seq(&oseq->os_oi, seq);
 
-       cfs_atomic_set(&oseq->os_refc, 1);
+       atomic_set(&oseq->os_refc, 1);
 
        rc = dt_attr_get(env, dob, &info->fti_attr, BYPASS_CAPA);
        if (rc)
@@ -346,7 +351,7 @@ static int ofd_fld_init(const struct lu_env *env, const char *uuid,
                RETURN(rc = -ENOMEM);
 
        rc = fld_server_init(env, ss->ss_server_fld, ofd->ofd_osd, uuid,
-                            ss->ss_node_id, LU_SEQ_RANGE_OST);
+                            LU_SEQ_RANGE_OST);
        if (rc) {
                OBD_FREE_PTR(ss->ss_server_fld);
                ss->ss_server_fld = NULL;
@@ -355,6 +360,38 @@ static int ofd_fld_init(const struct lu_env *env, const char *uuid,
        RETURN(0);
 }
 
+/**
+ * It will retrieve its FLDB entries from MDT0, and it only happens
+ * when upgrading existent FS to 2.6.
+ **/
+static int ofd_register_lwp_callback(void *data)
+{
+       struct lu_env           env;
+       struct ofd_device       *ofd = data;
+       struct lu_server_fld    *fld = ofd->ofd_seq_site.ss_server_fld;
+       int                     rc;
+       ENTRY;
+
+       if (!likely(fld->lsf_new))
+               RETURN(0);
+
+       rc = lu_env_init(&env, LCT_DT_THREAD);
+       if (rc) {
+               CERROR("%s: cannot init env: rc = %d\n", ofd_name(ofd), rc);
+               RETURN(rc);
+       }
+
+       rc = fld_update_from_controller(&env, fld);
+       if (rc != 0) {
+               CERROR("%s: cannot update controller: rc = %d\n",
+                      ofd_name(ofd), rc);
+               GOTO(out, rc);
+       }
+out:
+       lu_env_fini(&env);
+       RETURN(rc);
+}
+
 static int ofd_register_seq_exp(struct ofd_device *ofd)
 {
        struct seq_server_site  *ss = &ofd->ofd_seq_site;
@@ -365,7 +402,7 @@ static int ofd_register_seq_exp(struct ofd_device *ofd)
        if (lwp_name == NULL)
                GOTO(out_free, rc = -ENOMEM);
 
-       rc = tgt_name2lwpname(ofd_name(ofd), lwp_name);
+       rc = tgt_name2lwp_name(ofd_name(ofd), lwp_name, MAX_OBD_NAME, 0);
        if (rc != 0)
                GOTO(out_free, rc);
 
@@ -376,7 +413,7 @@ static int ofd_register_seq_exp(struct ofd_device *ofd)
 
        rc = lustre_register_lwp_item(lwp_name,
                                      &ss->ss_server_fld->lsf_control_exp,
-                                     NULL, NULL);
+                                     ofd_register_lwp_callback, ofd);
        if (rc != 0) {
                lustre_deregister_lwp_item(&ss->ss_client_seq->lcs_exp);
                ss->ss_client_seq->lcs_exp = NULL;