]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: lustre: issue in the offset in lnet match hash table
authorAlyona Romanenko <alyona.romanenko@seagate.com>
Wed, 2 Mar 2016 22:01:50 +0000 (17:01 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 Mar 2016 23:23:49 +0000 (15:23 -0800)
the offset in hash table is overflowed for no wildcard portal.
The offset for no wildcard has been corrected as for wildcard
in the LU-1622

Signed-off-by: Alyona Romanenko <alyona.romanenko@seagate.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-7774
Reviewed-on: http://review.whamcloud.com/18422
Reviewed-by: Doug Oucharek <doug.s.oucharek@intel.com>
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lnet/lnet/lib-ptl.c

index 2b41205825fc17539423a4b57f89122913db5ca5..3947e8b711c05d94204fce0cbab4f2af24ad27e0 100644 (file)
@@ -360,16 +360,15 @@ lnet_mt_match_head(struct lnet_match_table *mtable,
                   lnet_process_id_t id, __u64 mbits)
 {
        struct lnet_portal *ptl = the_lnet.ln_portals[mtable->mt_portal];
+       unsigned long hash = mbits;
 
-       if (lnet_ptl_is_wildcard(ptl)) {
-               return &mtable->mt_mhash[mbits & LNET_MT_HASH_MASK];
-       } else {
-               unsigned long hash = mbits + id.nid + id.pid;
+       if (!lnet_ptl_is_wildcard(ptl)) {
+               hash += id.nid + id.pid;
 
                LASSERT(lnet_ptl_is_unique(ptl));
                hash = hash_long(hash, LNET_MT_HASH_BITS);
-               return &mtable->mt_mhash[hash];
        }
+       return &mtable->mt_mhash[hash & LNET_MT_HASH_MASK];
 }
 
 int