lockd/locks bugfixes for 4.7

Please pull from:

git://linux-nfs.org/~bfields/linux.git tags/nfsd-4.7-3

----------------------------------------------------------------
One fix for lockd soft lookups in an error path, and one fix for file leases on overlayfs.

----------------------------------------------------------------
Miklos Szeredi (1):
locks: use file_inode()

Scott Mayhew (1):
lockd: unregister notifier blocks if the service fails to come up completely

 fs/lockd/svc.c | 13 ++++++++++---
 fs/locks.c     |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)