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

Pull dlm updates from David Teigland:
 "This set includes some minor fixes and improvements.  The one large
  patch addresses the special "nodir" mode, which has been a long
  neglected proof of concept, but with these fixes seems to be quite
  usable.  It allows the resource master to be assigned statically
  instead of dynamically, which can improve performance if there is
  little locality and most resources are shared."

* tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: NULL dereference on failure in kmem_cache_create()
  gfs2: fix recovery during unmount
  dlm: fixes for nodir mode
  dlm: improve error and debug messages
  dlm: avoid unnecessary search in search_rsb
  dlm: limit rcom debug messages
  dlm: fix waiter recovery
  dlm: prevent connections during shutdown

4 files changed, 7 insertions, 13 deletions

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index aa9949e5de26..67fd6beffece 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -543,7 +543,6 @@ struct gfs2_sb_host {
 struct lm_lockstruct {
         int ls_jid;
         unsigned int ls_first;
-        unsigned int ls_nodir;
         const struct lm_lockops *ls_ops;
         dlm_lockspace_t *ls_dlm;
 
diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c
index 5f5e70e047dc..4a38db739ca0 100644
--- a/fs/gfs2/lock_dlm.c
+++ b/fs/gfs2/lock_dlm.c
@@ -1209,8 +1209,6 @@ static int gdlm_mount(struct gfs2_sbd *sdp, const char *table)
         fsname++;
 
         flags = DLM_LSFL_FS | DLM_LSFL_NEWEXCL;
-        if (ls->ls_nodir)
-                flags |= DLM_LSFL_NODIR;
 
         /*
          * create/join lockspace
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index c5871ae40561..b8c250fc4922 100644
--- 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:
diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index d33172c291ba..9c2592b1d5ff 100644
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -368,10 +368,7 @@ int gfs2_recover_set(struct gfs2_sbd *sdp, unsigned jid)
         struct gfs2_jdesc *jd;
         int rv;
 
-        rv = -ESHUTDOWN;
         spin_lock(&sdp->sd_jindex_spin);
-        if (test_bit(SDF_NORECOVERY, &sdp->sd_flags))
-                goto out;
         rv = -EBUSY;
         if (sdp->sd_jdesc->jd_jid == jid)
                 goto out;
@@ -396,8 +393,13 @@ static ssize_t recover_store(struct gfs2_sbd *sdp, const char *buf, size_t len)
         if (rv != 1)
                 return -EINVAL;
 
-        rv = gfs2_recover_set(sdp, jid);
+        if (test_bit(SDF_NORECOVERY, &sdp->sd_flags)) {
+                rv = -ESHUTDOWN;
+                goto out;
+        }
 
+        rv = gfs2_recover_set(sdp, jid);
+out:
         return rv ? rv : len;
 }