From: Linus Torvalds Date: Thu, 12 Apr 2018 20:00:44 +0000 (-0700) Subject: Merge tag 'gfs2-4.17.fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2... X-Git-Tag: v4.17-rc1~33 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4ac1800f81eb52f776aca201e791eec2ef355259;p=users%2Fhch%2Fmisc.git Merge tag 'gfs2-4.17.fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 Pull more gfs2 updates from Bob Peterson: "We decided to request the latest three patches to be merged into this merge window while it's still open. - The first patch adds a new function to lockref: lockref_put_not_zero - The second patch fixes GFS2's glock dump code so it uses the new lockref function. This fixes a problem whereby lock dumps could miss glocks. - I made a minor patch to update some comments and fix the lock ordering text in our gfs2-glocks.txt Documentation file" * tag 'gfs2-4.17.fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2: GFS2: Minor improvements to comments and documentation gfs2: Stop using rhashtable_walk_peek lockref: Add lockref_put_not_zero --- 4ac1800f81eb52f776aca201e791eec2ef355259