LU-5988 obdclass: drop malloc fault and page accounting

[fs/lustre-release.git] / lustre / obdclass / linux / linux-sysctl.c

diff --git a/lustre/obdclass/linux/linux-sysctl.c b/lustre/obdclass/linux/linux-sysctl.c
index a7c5ac5..0a648a6 100644 (file)
--- a/lustre/obdclass/linux/linux-sysctl.c
+++ b/lustre/obdclass/linux/linux-sysctl.c
@@ -96,31 +96,6 @@ proc_memory_alloc(struct ctl_table *table, int write, void __user *buffer,
 }
 
 static int
-proc_pages_alloc(struct ctl_table *table, int write, void __user *buffer,
-                size_t *lenp, loff_t *ppos)
-{
-        char buf[22];
-        int len;
-
-        if (!*lenp || (*ppos && !write)) {
-                *lenp = 0;
-                return 0;
-        }
-        if (write)
-                return -EINVAL;
-
-        len = snprintf(buf, sizeof(buf), LPU64"\n", obd_pages_sum());
-        if (len > *lenp)
-                len = *lenp;
-        buf[len] = '\0';
-       if (copy_to_user(buffer, buf, len))
-                return -EFAULT;
-        *lenp = len;
-        *ppos += *lenp;
-        return 0;
-}
-
-static int
 proc_mem_max(struct ctl_table *table, int write, void __user *buffer,
             size_t *lenp, loff_t *ppos)
 {
@@ -146,31 +121,6 @@ proc_mem_max(struct ctl_table *table, int write, void __user *buffer,
 }
 
 static int
-proc_pages_max(struct ctl_table *table, int write, void __user *buffer,
-              size_t *lenp, loff_t *ppos)
-{
-        char buf[22];
-        int len;
-
-        if (!*lenp || (*ppos && !write)) {
-                *lenp = 0;
-                return 0;
-        }
-        if (write)
-                return -EINVAL;
-
-        len = snprintf(buf, sizeof(buf), LPU64"\n", obd_pages_max());
-        if (len > *lenp)
-                len = *lenp;
-        buf[len] = '\0';
-       if (copy_to_user(buffer, buf, len))
-                return -EFAULT;
-        *lenp = len;
-        *ppos += *lenp;
-        return 0;
-}
-
-static int
 proc_max_dirty_pages_in_mb(struct ctl_table *table, int write,
                           void __user *buffer, size_t *lenp, loff_t *ppos)
 {
@@ -216,39 +166,6 @@ proc_max_dirty_pages_in_mb(struct ctl_table *table, int write,
        return rc;
 }
 
-#ifdef RANDOM_FAIL_ALLOC
-static int proc_alloc_fail_rate(struct ctl_table *table, int write,
-                               void __user *buffer, size_t *lenp, loff_t *ppos)
-{
-        int rc          = 0;
-
-        if (!table->data || !table->maxlen || !*lenp || (*ppos && !write)) {
-                *lenp = 0;
-                return 0;
-        }
-        if (write) {
-                rc = lprocfs_write_frac_helper(buffer, *lenp,
-                                               (unsigned int*)table->data,
-                                               OBD_ALLOC_FAIL_MULT);
-        } else {
-                char buf[21];
-                int  len;
-
-                len = lprocfs_read_frac_helper(buf, 21,
-                                               *(unsigned int*)table->data,
-                                               OBD_ALLOC_FAIL_MULT);
-                if (len > *lenp)
-                        len = *lenp;
-                buf[len] = '\0';
-               if (copy_to_user(buffer, buf, len))
-                        return -EFAULT;
-                *lenp = len;
-        }
-        *ppos += *lenp;
-        return rc;
-}
-#endif
-
 #ifdef CONFIG_SYSCTL
 static struct ctl_table obd_table[] = {
        {
@@ -293,14 +210,6 @@ static struct ctl_table obd_table[] = {
        },
        {
                INIT_CTL_NAME
-               .procname       = "pagesused",
-               .data           = NULL,
-               .maxlen         = 0,
-               .mode           = 0444,
-               .proc_handler   = &proc_pages_alloc
-       },
-       {
-               INIT_CTL_NAME
                .procname       = "memused_max",
                .data           = NULL,
                .maxlen         = 0,
@@ -309,30 +218,12 @@ static struct ctl_table obd_table[] = {
        },
        {
                INIT_CTL_NAME
-               .procname       = "pagesused_max",
-               .data           = NULL,
-               .maxlen         = 0,
-               .mode           = 0444,
-               .proc_handler   = &proc_pages_max
-       },
-       {
-               INIT_CTL_NAME
                .procname       = "ldlm_timeout",
                .data           = &ldlm_timeout,
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = &proc_set_timeout
        },
-#ifdef RANDOM_FAIL_ALLOC
-       {
-               INIT_CTL_NAME
-               .procname       = "alloc_fail_rate",
-               .data           = &obd_alloc_fail_rate,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = &proc_alloc_fail_rate
-       },
-#endif
        {
                INIT_CTL_NAME
                .procname       = "max_dirty_mb",