diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-01 15:18:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-01 15:18:49 -0700 |
| commit | 2728c57fda2c10cb290f1516cab5b170ea2e3f22 (patch) | |
| tree | 7bdfc18c062501d5fe3b56d35e2660028af4cc5e /fs/locks.c | |
| parent | 0d064a7b9c43e79c97cb2372850e12971de23b22 (diff) | |
| parent | 6343a2120862f7023006c8091ad95c1f16a32077 (diff) | |
| download | linux-2728c57fda2c10cb290f1516cab5b170ea2e3f22.tar.gz | |
Merge tag 'nfsd-4.7-3' of git://linux-nfs.org/~bfields/linux
Pull lockd/locks fixes from Bruce Fields:
"One fix for lockd soft lookups in an error path, and one fix for file
leases on overlayfs"
* tag 'nfsd-4.7-3' of git://linux-nfs.org/~bfields/linux:
locks: use file_inode()
lockd: unregister notifier blocks if the service fails to come up completely
Diffstat (limited to 'fs/locks.c')
| -rw-r--r-- | fs/locks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c index 7c5f91be9b65..ee1b15f6fc13 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1628,7 +1628,7 @@ generic_add_lease(struct file *filp, long arg, struct file_lock **flp, void **pr { struct file_lock *fl, *my_fl = NULL, *lease; struct dentry *dentry = filp->f_path.dentry; - struct inode *inode = dentry->d_inode; + struct inode *inode = file_inode(filp); struct file_lock_context *ctx; bool is_deleg = (*flp)->fl_flags & FL_DELEG; int error; |