LU-11765 ofd: return EAGAIN during 1st CLEANUP_ORPHAN

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

diff --git a/lustre/ofd/ofd_dev.c b/lustre/ofd/ofd_dev.c
index 531d95a..af33796 100644 (file)
--- a/lustre/ofd/ofd_dev.c
+++ b/lustre/ofd/ofd_dev.c
@@ -320,13 +320,7 @@ static bool match_symlink_param(char *param)
                sval = strchr(param, '=');
                if (sval != NULL) {
                        paramlen = sval - param;
-                       if (strncmp(param, "writethrough_cache_enable",
-                                   paramlen) == 0 ||
-                           strncmp(param, "readcache_max_filesize",
-                                   paramlen) == 0 ||
-                           strncmp(param, "read_cache_enable",
-                                   paramlen) == 0 ||
-                           strncmp(param, "brw_stats", paramlen) == 0)
+                       if (strncmp(param, "brw_stats", paramlen) == 0)
                                return true;
                }
        }
@@ -715,8 +709,31 @@ static struct lu_device_operations ofd_lu_ops = {
  */
 static void ofd_procfs_add_brw_stats_symlink(struct ofd_device *ofd)
 {
-       struct obd_device       *obd = ofd_obd(ofd);
-       struct obd_device       *osd_obd = ofd->ofd_osd_exp->exp_obd;
+       struct obd_device *obd = ofd_obd(ofd);
+       struct obd_device *osd_obd = ofd->ofd_osd_exp->exp_obd;
+       struct kobj_type *osd_type;
+       int i;
+
+       osd_type = get_ktype(&ofd->ofd_osd->dd_kobj);
+       for (i = 0; osd_type->default_attrs[i]; i++) {
+               if (strcmp(osd_type->default_attrs[i]->name,
+                          "read_cache_enable") == 0) {
+                       ofd->ofd_read_cache_enable =
+                               osd_type->default_attrs[i];
+               }
+
+               if (strcmp(osd_type->default_attrs[i]->name,
+                          "readcache_max_filesize") == 0) {
+                       ofd->ofd_read_cache_max_filesize =
+                               osd_type->default_attrs[i];
+               }
+
+               if (strcmp(osd_type->default_attrs[i]->name,
+                          "writethrough_cache_enable") == 0) {
+                       ofd->ofd_write_cache_enable =
+                               osd_type->default_attrs[i];
+               }
+       }
 
        if (obd->obd_proc_entry == NULL)
                return;
@@ -724,20 +741,6 @@ static void ofd_procfs_add_brw_stats_symlink(struct ofd_device *ofd)
        lprocfs_add_symlink("brw_stats", obd->obd_proc_entry,
                            "../../%s/%s/brw_stats",
                            osd_obd->obd_type->typ_name, obd->obd_name);
-
-       lprocfs_add_symlink("read_cache_enable", obd->obd_proc_entry,
-                           "../../%s/%s/read_cache_enable",
-                           osd_obd->obd_type->typ_name, obd->obd_name);
-
-       lprocfs_add_symlink("readcache_max_filesize",
-                           obd->obd_proc_entry,
-                           "../../%s/%s/readcache_max_filesize",
-                           osd_obd->obd_type->typ_name, obd->obd_name);
-
-       lprocfs_add_symlink("writethrough_cache_enable",
-                           obd->obd_proc_entry,
-                           "../../%s/%s/writethrough_cache_enable",
-                           osd_obd->obd_type->typ_name, obd->obd_name);
 }
 #endif
 
@@ -789,18 +792,19 @@ int ofd_fid_fini(const struct lu_env *env, struct ofd_device *ofd)
  */
 int ofd_fid_init(const struct lu_env *env, struct ofd_device *ofd)
 {
-       struct seq_server_site  *ss = &ofd->ofd_seq_site;
-       struct lu_device        *lu = &ofd->ofd_dt_dev.dd_lu_dev;
-       char                    *obd_name = ofd_name(ofd);
-       char                    *name = NULL;
-       int                     rc = 0;
+       struct seq_server_site *ss = &ofd->ofd_seq_site;
+       struct lu_device *lu = &ofd->ofd_dt_dev.dd_lu_dev;
+       char *obd_name = ofd_name(ofd);
+       char *name = NULL;
+       int len = strlen(obd_name) + 7;
+       int rc = 0;
 
        ss = &ofd->ofd_seq_site;
        lu->ld_site->ld_seq_site = ss;
        ss->ss_lu = lu->ld_site;
        ss->ss_node_id = ofd->ofd_lut.lut_lsd.lsd_osd_index;
 
-       OBD_ALLOC(name, sizeof(obd_name) * 2 + 10);
+       OBD_ALLOC(name, len);
        if (name == NULL)
                return -ENOMEM;
 
@@ -811,7 +815,7 @@ int ofd_fid_init(const struct lu_env *env, struct ofd_device *ofd)
        rc = seq_server_init(env, ss->ss_server_seq, ofd->ofd_osd, obd_name,
                             LUSTRE_SEQ_SERVER, ss);
        if (rc) {
-               CERROR("%s : seq server init error %d\n", obd_name, rc);
+               CERROR("%s: seq server init error: rc = %d\n", obd_name, rc);
                GOTO(out_server, rc);
        }
        ss->ss_server_seq->lss_space.lsr_index = ss->ss_node_id;
@@ -820,15 +824,11 @@ int ofd_fid_init(const struct lu_env *env, struct ofd_device *ofd)
        if (ss->ss_client_seq == NULL)
                GOTO(out_server, rc = -ENOMEM);
 
-       /*
-        * It always printed as "%p", so that the name is unique in the kernel,
-        * even if the filesystem is mounted twice. So sizeof(.) * 2 is enough.
-        */
-       snprintf(name, sizeof(obd_name) * 2 + 7, "%p-super", obd_name);
+       snprintf(name, len, "%s-super", obd_name);
        rc = seq_client_init(ss->ss_client_seq, NULL, LUSTRE_SEQ_DATA,
                             name, NULL);
        if (rc) {
-               CERROR("%s : seq client init error %d\n", obd_name, rc);
+               CERROR("%s: seq client init error: rc = %d\n", obd_name, rc);
                GOTO(out_client, rc);
        }
 
@@ -845,7 +845,7 @@ out_server:
                ss->ss_server_seq = NULL;
        }
 out_name:
-       OBD_FREE(name, sizeof(obd_name) * 2 + 10);
+       OBD_FREE(name, len);
 
        return rc;
 }
@@ -1715,6 +1715,8 @@ static int ofd_create_hdl(struct tgt_session_info *tsi)
        EXIT;
        ofd_counter_incr(exp, LPROC_OFD_STATS_CREATE,
                         tsi->tsi_jobid, 1);
+       if (unlikely(!oseq->os_last_id_synced))
+               oseq->os_last_id_synced = 1;
 out:
        mutex_unlock(&oseq->os_create_lock);
 out_nolock: