Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

[firefly-linux-kernel-4.4.55.git] / fs / gfs2 / ops_fstype.c

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index c5871ae4056185dc687ea0bc6b956c5897b5cd7a..b8c250fc4922e8dd501a0c12c1481f7d1a32e0d8 100644 (file)
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -993,6 +993,7 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent)
                                ls->ls_jid = option;
                        break;
                case Opt_id:
+               case Opt_nodir:
                        /* Obsolete, but left for backward compat purposes */
                        break;
                case Opt_first:
@@ -1001,12 +1002,6 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent)
                                goto hostdata_error;
                        ls->ls_first = option;
                        break;
-               case Opt_nodir:
-                       ret = match_int(&tmp[0], &option);
-                       if (ret || (option != 0 && option != 1))
-                               goto hostdata_error;
-                       ls->ls_nodir = option;
-                       break;
                case Opt_err:
                default:
 hostdata_error: