Imported Upstream version 0.6.3+git20140731

[mirror_spl-debian.git] / module / spl / spl-proc.c

diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c
index f25239aca9c452f3c7535bfa901ca6cce5a0d466..b4be84fef9bbef890c2f55d3a4ca6bd1e0a8e8c1 100644 (file)
--- a/module/spl/spl-proc.c
+++ b/module/spl/spl-proc.c
@@ -72,7 +72,6 @@ struct proc_dir_entry *proc_spl_kstat = NULL;
 
 #define CTL_VERSION            CTL_UNNUMBERED /* Version */
 #define CTL_HOSTID             CTL_UNNUMBERED /* Host id by /usr/bin/hostid */
-#define CTL_HW_SERIAL          CTL_UNNUMBERED /* HW serial number by hostid */
 #define CTL_KALLSYMS           CTL_UNNUMBERED /* kallsyms_lookup_name addr */
 
 #define CTL_DEBUG_SUBSYS       CTL_UNNUMBERED /* Debug subsystem */
@@ -129,7 +128,6 @@ enum {
 enum {
        CTL_VERSION = 1,                /* Version */
        CTL_HOSTID,                     /* Host id reported by /usr/bin/hostid */
-       CTL_HW_SERIAL,                  /* Hardware serial number from hostid */
        CTL_KALLSYMS,                   /* Address of kallsyms_lookup_name */
 
 #ifdef DEBUG_LOG
@@ -513,9 +511,6 @@ SPL_PROC_HANDLER(proc_dohostid)
                 if (str == end)
                         SRETURN(-EINVAL);
 
-                (void) snprintf(hw_serial, HW_HOSTID_LEN, "%lu", spl_hostid);
-                hw_serial[HW_HOSTID_LEN - 1] = '\0';
-                *ppos += *lenp;
         } else {
                 len = snprintf(str, sizeof(str), "%lx", spl_hostid);
                 if (*ppos >= len)
@@ -651,6 +646,12 @@ slab_seq_show(struct seq_file *f, void *p)
 
         ASSERT(skc->skc_magic == SKC_MAGIC);
 
+       /*
+        * Backed by Linux slab see /proc/slabinfo.
+        */
+       if (skc->skc_flags & KMC_SLAB)
+               return (0);
+
         spin_lock(&skc->skc_lock);
         seq_printf(f, "%-36s  ", skc->skc_name);
         seq_printf(f, "0x%05lx %9lu %9lu %8u %8u  "
@@ -1058,14 +1059,6 @@ static struct ctl_table spl_table[] = {
                 .mode     = 0644,
                 .proc_handler = &proc_dohostid,
         },
-        {
-                CTL_NAME    (CTL_HW_SERIAL)
-                .procname = "hw_serial",
-                .data     = hw_serial,
-                .maxlen   = sizeof(hw_serial),
-                .mode     = 0444,
-                .proc_handler = &proc_dostring,
-        },
 #ifndef HAVE_KALLSYMS_LOOKUP_NAME
         {
                 CTL_NAME    (CTL_KALLSYMS)