Merge tag 'locks-v3.16-2' of git://git.samba.org/jlayton/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Jun 2014 02:40:30 +0000 (16:40 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 22 Jun 2014 02:40:30 +0000 (16:40 -1000)
commit2dfded821097be62dc7ba20d53a9c96d0de13134
treec686cdb704fe91337e8e7ea5253c9582b407e51c
parent532f51388b0432f41f4a178a98207ba1d81149f7
parent0c27362998a8357f199501aa401e99c51c2eb46e
Merge tag 'locks-v3.16-2' of git://git.samba.org/jlayton/linux

Pull file locking fixes from Jeff Layton:
 "File locking related bugfixes

  Nothing too earth-shattering here.  A fix for a potential regression
  due to a patch in pile #1, and the addition of a memory barrier to
  prevent a race condition between break_deleg and generic_add_lease"

* tag 'locks-v3.16-2' of git://git.samba.org/jlayton/linux:
  locks: set fl_owner for leases back to current->files
  locks: add missing memory barrier in break_deleg
include/linux/fs.h