diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-07-21 13:58:19 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-07-21 13:58:19 +0800 |
| commit | 74b60e9f6f938d0cd4c7a71e583aee3cc6c5fbba (patch) | |
| tree | 15cbca70f3f6d7e10da7d82154a78e6ca35dca8c /fs/locks.c | |
| parent | f24f1475658431d60bcd4e6e5de951ba1663dd43 (diff) | |
| parent | 1d508e233d21a7848cf54d7d03b40dac2d9ea873 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rtlsk-v4.1-16.07-rt
Conflicts:
mm/swap.c
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 8501eecb2af0..3c234b9fbdd9 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1596,7 +1596,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; |