tree 211a19371f08f963c520f398e290e7c94e555139
parent 98077a720584182fe594ccbf8a7e6ce2a00796b3
parent 96006ea6d4eea73466e90ef353bf34e507724e77
author Linus Torvalds <torvalds@linux-foundation.org> 1343336622 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1343336622 -0700
mergetag object 96006ea6d4eea73466e90ef353bf34e507724e77
 type commit
 tag dlm-3.6
 tagger David Teigland <teigland@redhat.com> 1343248020 -0500
 
 dlm for 3.6
 
 This set includes a major redesign of recording the master node for
 resources.  The old dir hash table, which just held the master node for
 each resource, has been removed.  The rsb hash table has always duplicated
 the master node value from the dir, and is now the single record of it.
 
 Having two full hash tables of all resources has always been a waste,
 especially since one just duplicated a single value from the other.
 Local requests will now often require one instead of two lengthy hash
 table searches.
 
 The other substantial change is made possible by the dirtbl removal, and
 fixes a long standing race between resource removal and lookup by
 reworking how removal is done.  At the same time it improves the
 efficiency of removal by avoiding repeated searches through a hash bucket.
 
 The other commits include minor fixes and changes.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJQEFuFAAoJEDgbc8f8gGmqklAQAL2gMCp3asEbbUa2FRd5cZQT
 IfELLBS0kqr6ghEDpV1XTVig8vCwhGoa9UC/jYEtqnmo02ImjCOvxM4wcSAjbEhc
 L0J/JwfQNPtAbs8NN7vo7p2n5DPCWcKr3YiksvrPpQdXXAVTAfC4SkK028hF6n8B
 LtMrADqsz+dTqg6UQTCRsMyZlLrFNPZiR5IRy72BQLmg+lcNNtARb0T++W2EfAAV
 03RnEUQPxbrKNZpVAAdncX5NUZz/D+DB5DMLF2q+hfquuGvheizmZHipnhOexeKV
 YZcQA/232BH0kqbKTGoIyqgMlCeKTgL56lBMyax3naEbBu4s80ZPOXjuA4pUpx5p
 24mCtXcozoZ9WCJZwSNUqVGfG22HKSMGXTVoXxteamL/8CQ9XRPAvH/UpHi38LBm
 pzQ+aZGHDXpDlMlQYTnD4n7NEiq8IV5p9sOZnK2EjSshoiWefQomx73wFpwqdRgm
 TYtb583BjdU1QYLYGiJTy9yqg693Ket3pSipOVoqH/qMGM+d7Z3cwoMvcoHTVkOf
 Z2XiFvfTjWcA+4givvUOWTd9FuFJ+KQr+mPo867lIJyuT0KDttVDwZyQPqN7m7ma
 ymS9tVmrmfVmq97XkypVDkZELchqaW41Y8BKQ4c5JxRDLQX6Di7Pq36S6XL7mrOf
 medHFc9e6jhrS45lvpw+
 =1bGM
 -----END PGP SIGNATURE-----

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

Pull dlm updatesfrom David Teigland:
 "This set includes a major redesign of recording the master node for
  resources.  The old dir hash table, which just held the master node
  for each resource, has been removed.  The rsb hash table has always
  duplicated the master node value from the dir, and is now the single
  record of it.

  Having two full hash tables of all resources has always been a waste,
  especially since one just duplicated a single value from the other.
  Local requests will now often require one instead of two lengthy hash
  table searches.

  The other substantial change is made possible by the dirtbl removal,
  and fixes a long standing race between resource removal and lookup by
  reworking how removal is done.  At the same time it improves the
  efficiency of removal by avoiding repeated searches through a hash
  bucket.

  The other commits include minor fixes and changes."

* tag 'dlm-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: fix missing dir remove
  dlm: fix conversion deadlock from recovery
  dlm: use wait_event_timeout
  dlm: fix race between remove and lookup
  dlm: use idr instead of list for recovered rsbs
  dlm: use rsbtbl as resource directory