summary refs log tree commit diff
path: root/fs/cifs/smb2proto.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-07-07 17:38:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-07-07 17:38:17 -0700
commit1a86fc754fc2bae3be5fe00c1b553b91ba20e089 (patch)
treef5568e55bebc40461a012f27391670978b777a2b /fs/cifs/smb2proto.h
parenta7d4026834f8263a8a4eabeb753e3747988ef0d2 (diff)
parent961ae1d83d055a4b9ebbfb4cc8ca62ec1a7a3b74 (diff)
downloadlinux-1a86fc754fc2bae3be5fe00c1b553b91ba20e089.tar.gz
Merge tag 'gfs2-4.13.fixes.addendum' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2
Pull GFS2 fix from Bob Peterson:
 "Sorry for the additional merge request, but Andreas discovered this
  problem soon after you processed our last gfs2 merge.

  This fixes a regression introduced by a patch we did in mid-2015
  (commit 88ffbf3e037e: "GFS2: Use resizable hash table for glocks"), so
  best to get it fixed. Some code was reverted that should not have
  been.

  The patch from Andreas Gruenbacher just re-adds code that had been
  there originally"

* tag 'gfs2-4.13.fixes.addendum' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
  gfs2: Fix glock rhashtable rcu bug
Diffstat (limited to 'fs/cifs/smb2proto.h')
0 files changed, 0 insertions, 0 deletions