nlm: Ensure callback code also checks that the files match

[pandora-kernel.git] / include / linux / lockd / lockd.h

diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index ff9abff..92f64c4 100644 (file)
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -348,7 +348,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 fl1->fl_file->f_dentry->d_inode == fl2->fl_file->f_dentry->d_inode
+            && fl1->fl_pid   == fl2->fl_pid
             && fl1->fl_owner == fl2->fl_owner
             && fl1->fl_start == fl2->fl_start
             && fl1->fl_end   == fl2->fl_end