diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-25 13:54:58 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-25 13:54:57 -0700 |
| commit | ba53c4518c7bf3b3abda54284cfb2a6d2175749b (patch) | |
| tree | 9f56beb17efa19aafebb40d245d5c159bf4c4b12 /include/linux/lockd | |
| parent | 63e553c0c5ad690fb0f4e9990dd77f93441b3afc (diff) | |
| parent | a4b9c109c2f9143790c1d1a96475eecf7338713a (diff) | |
Merge "Merge tag v4.4.55 into branch 'msm-4.4'"
Diffstat (limited to 'include/linux/lockd')
| -rw-r--r-- | include/linux/lockd/lockd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index c15373894a42..b37dee3acaba 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h @@ -355,7 +355,8 @@ static inline int nlm_privileged_requester(const struct svc_rqst *rqstp) static inline int nlm_compare_locks(const struct file_lock *fl1, const struct file_lock *fl2) { - return fl1->fl_pid == fl2->fl_pid + return file_inode(fl1->fl_file) == file_inode(fl2->fl_file) + && fl1->fl_pid == fl2->fl_pid && fl1->fl_owner == fl2->fl_owner && fl1->fl_start == fl2->fl_start && fl1->fl_end == fl2->fl_end |