1 files changed, 3 insertions, 2 deletions

diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index a8876bc6513..0d92c468d55 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -49,11 +49,12 @@ struct nlm_host {
                                 h_killed     : 1,
                                 h_monitored  : 1;
         wait_queue_head_t       h_gracewait;    /* wait while reclaiming */
+        struct rw_semaphore     h_rwsem;        /* Reboot recovery lock */
         u32                     h_state;        /* pseudo-state counter */
         u32                     h_nsmstate;     /* true remote NSM state */
         u32                     h_pidcount;     /* Pseudopids */
         atomic_t                h_count;        /* reference count */
-        struct semaphore        h_sema;         /* mutex for pmap binding */
+        struct mutex            h_mutex;        /* mutex for pmap binding */
         unsigned long           h_nextrebind;   /* next portmap call */
         unsigned long           h_expires;      /* eligible for GC */
         struct list_head        h_lockowners;   /* Lockowners for the client */
@@ -122,7 +123,6 @@ struct nlm_block {
         unsigned int            b_id;           /* block id */
         unsigned char           b_queued;       /* re-queued */
         unsigned char           b_granted;      /* VFS granted lock */
-        unsigned char           b_done;         /* callback complete */
         struct nlm_file *       b_file;         /* file in question */
 };
 
@@ -219,6 +219,7 @@ static __inline__ int
 nlm_compare_locks(const struct file_lock *fl1, const struct file_lock *fl2)
 {
         return  fl1->fl_pid   == fl2->fl_pid
+             && fl1->fl_owner == fl2->fl_owner
              && fl1->fl_start == fl2->fl_start
              && fl1->fl_end   == fl2->fl_end
              &&(fl1->fl_type  == fl2->fl_type || fl2->fl_type == F_UNLCK);