OSDN Git Service

fsi: sbefifo: Fix inconsistent use of ffdc mutex
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 23 Jul 2018 06:27:21 +0000 (16:27 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 23 Jul 2018 06:27:32 +0000 (16:27 +1000)
Some of the exit path missed the unlock. Move the mutex to
an outer function to avoid the problem completely

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
drivers/fsi/fsi-sbefifo.c

index 6b31cc2..33a5d9a 100644 (file)
@@ -136,16 +136,14 @@ struct sbefifo_user {
 static DEFINE_IDA(sbefifo_ida);
 static DEFINE_MUTEX(sbefifo_ffdc_mutex);
 
-
-static void sbefifo_dump_ffdc(struct device *dev, const __be32 *ffdc,
-                             size_t ffdc_sz, bool internal)
+static void __sbefifo_dump_ffdc(struct device *dev, const __be32 *ffdc,
+                               size_t ffdc_sz, bool internal)
 {
        int pack = 0;
 #define FFDC_LSIZE     60
        static char ffdc_line[FFDC_LSIZE];
        char *p = ffdc_line;
 
-       mutex_lock(&sbefifo_ffdc_mutex);
        while (ffdc_sz) {
                u32 w0, w1, w2, i;
                if (ffdc_sz < 3) {
@@ -194,6 +192,13 @@ static void sbefifo_dump_ffdc(struct device *dev, const __be32 *ffdc,
                }
                dev_warn(dev, "+-------------------------------------------+\n");
        }
+}
+
+static void sbefifo_dump_ffdc(struct device *dev, const __be32 *ffdc,
+                             size_t ffdc_sz, bool internal)
+{
+       mutex_lock(&sbefifo_ffdc_mutex);
+       __sbefifo_dump_ffdc(dev, ffdc, ffdc_sz, internal);
        mutex_unlock(&sbefifo_ffdc_mutex);
 }