Merge tag 'locks-v3.16-2' of git://

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://
  locks: set fl_owner for leases back to current->files
  locks: add missing memory barrier in break_deleg