diff options
Diffstat (limited to 'include/linux/lockd')
-rw-r--r-- | include/linux/lockd/lockd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index 995f89dc8c04..6b2684763fc7 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h | |||
@@ -50,11 +50,12 @@ struct nlm_host { | |||
50 | h_killed : 1, | 50 | h_killed : 1, |
51 | h_monitored : 1; | 51 | h_monitored : 1; |
52 | wait_queue_head_t h_gracewait; /* wait while reclaiming */ | 52 | wait_queue_head_t h_gracewait; /* wait while reclaiming */ |
53 | struct rw_semaphore h_rwsem; /* Reboot recovery lock */ | ||
53 | u32 h_state; /* pseudo-state counter */ | 54 | u32 h_state; /* pseudo-state counter */ |
54 | u32 h_nsmstate; /* true remote NSM state */ | 55 | u32 h_nsmstate; /* true remote NSM state */ |
55 | u32 h_pidcount; /* Pseudopids */ | 56 | u32 h_pidcount; /* Pseudopids */ |
56 | atomic_t h_count; /* reference count */ | 57 | atomic_t h_count; /* reference count */ |
57 | struct semaphore h_sema; /* mutex for pmap binding */ | 58 | struct mutex h_mutex; /* mutex for pmap binding */ |
58 | unsigned long h_nextrebind; /* next portmap call */ | 59 | unsigned long h_nextrebind; /* next portmap call */ |
59 | unsigned long h_expires; /* eligible for GC */ | 60 | unsigned long h_expires; /* eligible for GC */ |
60 | struct list_head h_lockowners; /* Lockowners for the client */ | 61 | struct list_head h_lockowners; /* Lockowners for the client */ |
@@ -220,6 +221,7 @@ static __inline__ int | |||
220 | nlm_compare_locks(const struct file_lock *fl1, const struct file_lock *fl2) | 221 | nlm_compare_locks(const struct file_lock *fl1, const struct file_lock *fl2) |
221 | { | 222 | { |
222 | return fl1->fl_pid == fl2->fl_pid | 223 | return fl1->fl_pid == fl2->fl_pid |
224 | && fl1->fl_owner == fl2->fl_owner | ||
223 | && fl1->fl_start == fl2->fl_start | 225 | && fl1->fl_start == fl2->fl_start |
224 | && fl1->fl_end == fl2->fl_end | 226 | && fl1->fl_end == fl2->fl_end |
225 | &&(fl1->fl_type == fl2->fl_type || fl2->fl_type == F_UNLCK); | 227 | &&(fl1->fl_type == fl2->fl_type || fl2->fl_type == F_UNLCK); |