diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2017-03-15 02:11:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-15 02:11:39 +0000 |
| commit | 27bd8e883cf414865b110194a779e967392ffab7 (patch) | |
| tree | 4c5e0785d0bf4d5c3cf3bb6bee626511cc3cf905 /include/linux | |
| parent | f2775d8e464a2cf0e79763b00d60844028108b90 (diff) | |
| parent | e1c924e85a937de5e1d0dd6c47f094b089952e0c (diff) | |
nlm: Ensure callback code also checks that the files match
am: e1c924e85a
Change-Id: I6dbae6de1a61687cb174b45dc47f488d24320bdf
Diffstat (limited to 'include/linux')
| -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 |