[GFS2] Check for installation of mount helpers for DLM mounts

[firefly-linux-kernel-4.4.55.git] / fs / gfs2 / locking / dlm / mount.c

diff --git a/fs/gfs2/locking/dlm/mount.c b/fs/gfs2/locking/dlm/mount.c
index 41c5b04caaba4194712fe955a76750462066d4b2..ab301023094f9b8f999705618bfa4e37c3889549 100644 (file)
--- a/fs/gfs2/locking/dlm/mount.c
+++ b/fs/gfs2/locking/dlm/mount.c
@@ -67,6 +67,12 @@ static int make_args(struct gdlm_ls *ls, char *data_arg, int *nodir)
        memset(data, 0, 256);
        strncpy(data, data_arg, 255);
 
+       if (!strlen(data)) {
+               printk(KERN_ERR
+                      "DLM/GFS2/GFS ERROR: (u)mount helpers are not installed!\n");
+               return -EINVAL;
+       }
+
        for (options = data; (x = strsep(&options, ":")); ) {
                if (!*x)
                        continue;