[S390] cio: introduce purge function for /proc/cio_ignore

Allow users to remove blacklisted ccw devices by using the
/proc/cio_ignore interface:

  echo purge > /proc/cio_ignore

will remove all devices which are offline and blacklisted.

Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index 0bfcbbe375c4..2f547b840ef0 100644
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -24,6 +24,7 @@
 #include "cio.h"
 #include "cio_debug.h"
 #include "css.h"
+#include "device.h"
 
 /*
  * "Blacklisting" of certain devices:
@@ -191,9 +192,9 @@ static int blacklist_parse_parameters(char *str, range_action action,
                         rc = blacklist_range(ra, from_ssid, to_ssid, from, to,
                                              msgtrigger);
                         if (rc)
-                                totalrc = 1;
+                                totalrc = -EINVAL;
                 } else
-                        totalrc = 1;
+                        totalrc = -EINVAL;
         }
 
         return totalrc;
@@ -240,8 +241,10 @@ static int blacklist_parse_proc_parameters(char *buf)
                 rc = blacklist_parse_parameters(buf, free, 0);
         else if (strcmp("add", parm) == 0)
                 rc = blacklist_parse_parameters(buf, add, 0);
+        else if (strcmp("purge", parm) == 0)
+                return ccw_purge_blacklisted();
         else
-                return 1;
+                return -EINVAL;
 
         css_schedule_reprobe();
 
@@ -353,7 +356,7 @@ cio_ignore_write(struct file *file, const char __user *user_buf,
         }
         ret = blacklist_parse_proc_parameters(buf);
         if (ret)
-                rc = -EINVAL;
+                rc = ret;
         else
                 rc = user_len;