LU-12616 obclass: fix MDS start/stop race

[fs/lustre-release.git] / lustre / osc / osc_request.c

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 29a3c16..b0ff640 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -902,12 +902,13 @@ static void osc_grant_work_handler(struct work_struct *data)
        if (client_gtd.gtd_stopped == 1)
                return;
 
-       if (next_shrink > ktime_get_seconds())
-               schedule_delayed_work(&work, msecs_to_jiffies(
-                                       (next_shrink - ktime_get_seconds()) *
-                                       MSEC_PER_SEC));
-       else
+       if (next_shrink > ktime_get_seconds()) {
+               time64_t delay = next_shrink - ktime_get_seconds();
+
+               schedule_delayed_work(&work, cfs_time_seconds(delay));
+       } else {
                schedule_work(&work.work);
+       }
 }
 
 void osc_schedule_grant_work(void)
@@ -1068,8 +1069,11 @@ static int check_write_rcs(struct ptlrpc_request *req,
 
         /* return error if any niobuf was in error */
         for (i = 0; i < niocount; i++) {
-                if ((int)remote_rcs[i] < 0)
-                        return(remote_rcs[i]);
+               if ((int)remote_rcs[i] < 0) {
+                       CDEBUG(D_INFO, "rc[%d]: %d req %p\n",
+                              i, remote_rcs[i], req);
+                       return remote_rcs[i];
+               }
 
                 if (remote_rcs[i] != 0) {
                         CDEBUG(D_INFO, "rc[%d] invalid (%d) req %p\n",
@@ -1624,7 +1628,7 @@ static void dump_all_bulk_pages(struct obdo *oa, __u32 page_count,
                kunmap(pga[i]->pg);
        }
 
-       rc = ll_vfs_fsync_range(filp, 0, LLONG_MAX, 1);
+       rc = vfs_fsync_range(filp, 0, LLONG_MAX, 1);
        if (rc)
                CERROR("%s: sync returns %d\n", dbgcksum_file_name, rc);
        filp_close(filp, NULL);
@@ -2730,6 +2734,22 @@ static int osc_statfs_async(struct obd_export *exp,
        int rc;
         ENTRY;
 
+       if (obd->obd_osfs_age >= max_age) {
+               CDEBUG(D_SUPER,
+                      "%s: use %p cache blocks %llu/%llu objects %llu/%llu\n",
+                      obd->obd_name, &obd->obd_osfs,
+                      obd->obd_osfs.os_bavail, obd->obd_osfs.os_blocks,
+                      obd->obd_osfs.os_ffree, obd->obd_osfs.os_files);
+               spin_lock(&obd->obd_osfs_lock);
+               memcpy(oinfo->oi_osfs, &obd->obd_osfs, sizeof(*oinfo->oi_osfs));
+               spin_unlock(&obd->obd_osfs_lock);
+               oinfo->oi_flags |= OBD_STATFS_FROM_CACHE;
+               if (oinfo->oi_cb_up)
+                       oinfo->oi_cb_up(oinfo, 0);
+
+               RETURN(0);
+       }
+
         /* We could possibly pass max_age in the request (as an absolute
          * timestamp or a "seconds.usec ago") so the target can avoid doing
          * extra calls into the filesystem if that isn't necessary (e.g.
@@ -2893,23 +2913,6 @@ int osc_set_info_async(const struct lu_env *env, struct obd_export *exp,
                 RETURN(0);
         }
 
-       if (KEY_IS(KEY_CACHE_SET)) {
-               struct client_obd *cli = &obd->u.cli;
-
-               LASSERT(cli->cl_cache == NULL); /* only once */
-               cli->cl_cache = (struct cl_client_cache *)val;
-               cl_cache_incref(cli->cl_cache);
-               cli->cl_lru_left = &cli->cl_cache->ccc_lru_left;
-
-               /* add this osc into entity list */
-               LASSERT(list_empty(&cli->cl_lru_osc));
-               spin_lock(&cli->cl_cache->ccc_lru_lock);
-               list_add(&cli->cl_lru_osc, &cli->cl_cache->ccc_lru);
-               spin_unlock(&cli->cl_cache->ccc_lru_lock);
-
-               RETURN(0);
-       }
-
        if (KEY_IS(KEY_CACHE_LRU_SHRINK)) {
                struct client_obd *cli = &obd->u.cli;
                long nr = atomic_long_read(&cli->cl_lru_in_list) >> 1;
@@ -3355,7 +3358,7 @@ static struct obd_ops osc_obd_ops = {
        .o_cleanup              = osc_cleanup_common,
         .o_add_conn             = client_import_add_conn,
         .o_del_conn             = client_import_del_conn,
-        .o_connect              = client_connect_import,
+       .o_connect              = client_connect_import,
         .o_reconnect            = osc_reconnect,
         .o_disconnect           = osc_disconnect,
         .o_statfs               = osc_statfs,
@@ -3393,8 +3396,6 @@ static int osc_cache_shrink(SHRINKER_ARGS(sc, nr_to_scan, gfp_mask))
 
 static int __init osc_init(void)
 {
-       bool enable_proc = true;
-       struct obd_type *type;
        unsigned int reqpool_size;
        unsigned int reqsize;
        int rc;
@@ -3411,11 +3412,7 @@ static int __init osc_init(void)
        if (rc)
                RETURN(rc);
 
-       type = class_search_type(LUSTRE_OSP_NAME);
-       if (type != NULL && type->typ_procsym != NULL)
-               enable_proc = false;
-
-       rc = class_register_type(&osc_obd_ops, NULL, enable_proc, NULL,
+       rc = class_register_type(&osc_obd_ops, NULL, true, NULL,
                                 LUSTRE_OSC_NAME, &osc_device_type);
        if (rc)
                GOTO(out_kmem, rc);