Whamcloud - gitweb
LU-2237 tests: new test for re-recreating last_rcvd
[fs/lustre-release.git] / lustre / osc / lproc_osc.c
index 742733c..05f13dd 100644 (file)
@@ -160,6 +160,48 @@ static int osc_wr_max_dirty_mb(struct file *file, const char *buffer,
         return count;
 }
 
+static int osc_rd_cached_mb(char *page, char **start, off_t off, int count,
+                           int *eof, void *data)
+{
+       struct obd_device *dev = data;
+       struct client_obd *cli = &dev->u.cli;
+       int shift = 20 - CFS_PAGE_SHIFT;
+       int rc;
+
+       rc = snprintf(page, count,
+                     "used_mb: %d\n"
+                     "busy_cnt: %d\n",
+                     (cfs_atomic_read(&cli->cl_lru_in_list) +
+                       cfs_atomic_read(&cli->cl_lru_busy)) >> shift,
+                     cfs_atomic_read(&cli->cl_lru_busy));
+
+       return rc;
+}
+
+/* shrink the number of caching pages to a specific number */
+static int osc_wr_cached_mb(struct file *file, const char *buffer,
+                           unsigned long count, void *data)
+{
+       struct obd_device *dev = data;
+       struct client_obd *cli = &dev->u.cli;
+       int pages_number, mult, rc;
+
+       mult = 1 << (20 - CFS_PAGE_SHIFT);
+       buffer = lprocfs_find_named_value(buffer, "used_mb:", &count);
+       rc = lprocfs_write_frac_helper(buffer, count, &pages_number, mult);
+       if (rc)
+               return rc;
+
+       if (pages_number < 0)
+               return -ERANGE;
+
+       rc = cfs_atomic_read(&cli->cl_lru_in_list) - pages_number;
+       if (rc > 0)
+               (void)osc_lru_shrink(cli, rc);
+
+       return count;
+}
+
 static int osc_rd_cur_dirty_bytes(char *page, char **start, off_t off,
                                   int count, int *eof, void *data)
 {
@@ -263,149 +305,6 @@ static int osc_wr_grant_shrink_interval(struct file *file, const char *buffer,
         return count;
 }
 
-static int osc_rd_create_count(char *page, char **start, off_t off, int count,
-                               int *eof, void *data)
-{
-        struct obd_device *obd = data;
-
-        if (obd == NULL)
-                return 0;
-
-        return snprintf(page, count, "%d\n",
-                        obd->u.cli.cl_oscc.oscc_grow_count);
-}
-
-/**
- * Set OSC creator's osc_creator::oscc_grow_count
- *
- * \param file   proc file
- * \param buffer buffer containing the value
- * \param count  buffer size
- * \param data   obd device
- *
- * \retval \a count
- */
-static int osc_wr_create_count(struct file *file, const char *buffer,
-                               unsigned long count, void *data)
-{
-        struct obd_device *obd = data;
-        int val, rc, i;
-
-        if (obd == NULL)
-                return 0;
-
-        rc = lprocfs_write_helper(buffer, count, &val);
-        if (rc)
-                return rc;
-
-        /* The MDT ALWAYS needs to limit the precreate count to
-         * OST_MAX_PRECREATE, and the constant cannot be changed
-         * because it is a value shared between the OSC and OST
-         * that is the maximum possible number of objects that will
-         * ever be handled by MDT->OST recovery processing.
-         *
-         * If the OST ever gets a request to delete more orphans,
-         * this implies that something has gone badly on the MDT
-         * and the OST will refuse to delete so much data from the
-         * filesystem as a safety measure. */
-        if (val < OST_MIN_PRECREATE || val > OST_MAX_PRECREATE)
-                return -ERANGE;
-        if (val > obd->u.cli.cl_oscc.oscc_max_grow_count)
-                return -ERANGE;
-
-        for (i = 1; (i << 1) <= val; i <<= 1)
-                ;
-        obd->u.cli.cl_oscc.oscc_grow_count = i;
-
-        return count;
-}
-
-/**
- * Read OSC creator's osc_creator::oscc_max_grow_count
- *
- * \param page       buffer to hold the returning string
- * \param start
- * \param off
- * \param count
- * \param eof
- *              proc read function parameters, please refer to kernel
- *              code fs/proc/generic.c proc_file_read()
- * \param data   obd device
- *
- * \retval number of characters printed.
- */
-static int osc_rd_max_create_count(char *page, char **start, off_t off,
-                                   int count, int *eof, void *data)
-{
-        struct obd_device *obd = data;
-
-        if (obd == NULL)
-                return 0;
-
-        return snprintf(page, count, "%d\n",
-                        obd->u.cli.cl_oscc.oscc_max_grow_count);
-}
-
-/**
- * Set OSC creator's osc_creator::oscc_max_grow_count
- *
- * \param file   proc file
- * \param buffer buffer containing the value
- * \param count  buffer size
- * \param data   obd device
- *
- * \retval \a count
- */
-static int osc_wr_max_create_count(struct file *file, const char *buffer,
-                                   unsigned long count, void *data)
-{
-        struct obd_device *obd = data;
-        int val, rc;
-
-        if (obd == NULL)
-                return 0;
-
-        rc = lprocfs_write_helper(buffer, count, &val);
-        if (rc)
-                return rc;
-
-        if (val < 0)
-                return -ERANGE;
-        if (val > OST_MAX_PRECREATE)
-                return -ERANGE;
-
-        if (obd->u.cli.cl_oscc.oscc_grow_count > val)
-                obd->u.cli.cl_oscc.oscc_grow_count = val;
-
-        obd->u.cli.cl_oscc.oscc_max_grow_count = val;
-
-        return count;
-}
-
-static int osc_rd_prealloc_next_id(char *page, char **start, off_t off,
-                                   int count, int *eof, void *data)
-{
-        struct obd_device *obd = data;
-
-        if (obd == NULL)
-                return 0;
-
-        return snprintf(page, count, LPU64"\n",
-                        obd->u.cli.cl_oscc.oscc_next_id);
-}
-
-static int osc_rd_prealloc_last_id(char *page, char **start, off_t off,
-                                   int count, int *eof, void *data)
-{
-        struct obd_device *obd = data;
-
-        if (obd == NULL)
-                return 0;
-
-        return snprintf(page, count, LPU64"\n",
-                        obd->u.cli.cl_oscc.oscc_last_id);
-}
-
 static int osc_rd_checksum(char *page, char **start, off_t off, int count,
                            int *eof, void *data)
 {
@@ -615,17 +514,13 @@ static struct lprocfs_vars lprocfs_osc_obd_vars[] = {
                                 osc_wr_max_rpcs_in_flight, 0 },
         { "destroys_in_flight", osc_rd_destroys_in_flight, 0, 0 },
         { "max_dirty_mb",    osc_rd_max_dirty_mb, osc_wr_max_dirty_mb, 0 },
+       { "osc_cached_mb",   osc_rd_cached_mb,     osc_wr_cached_mb, 0 },
         { "cur_dirty_bytes", osc_rd_cur_dirty_bytes, 0, 0 },
         { "cur_grant_bytes", osc_rd_cur_grant_bytes,
                              osc_wr_cur_grant_bytes, 0 },
         { "cur_lost_grant_bytes", osc_rd_cur_lost_grant_bytes, 0, 0},
         { "grant_shrink_interval", osc_rd_grant_shrink_interval,
                                    osc_wr_grant_shrink_interval, 0 },
-        { "create_count",    osc_rd_create_count, osc_wr_create_count, 0 },
-        { "max_create_count", osc_rd_max_create_count,
-                              osc_wr_max_create_count, 0},
-        { "prealloc_next_id", osc_rd_prealloc_next_id, 0, 0 },
-        { "prealloc_last_id", osc_rd_prealloc_last_id, 0, 0 },
         { "checksums",       osc_rd_checksum, osc_wr_checksum, 0 },
         { "checksum_type",   osc_rd_checksum_type, osc_wd_checksum_type, 0 },
         { "resend_count",    osc_rd_resend_count, osc_wr_resend_count, 0},