]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
btrfs: Use bd_dev to generate index when dev_state_hashtable add items.
authorGu JinXiang <gujx@cn.fujitsu.com>
Wed, 11 Oct 2017 08:44:27 +0000 (16:44 +0800)
committerDavid Sterba <dsterba@suse.com>
Mon, 30 Oct 2017 11:28:01 +0000 (12:28 +0100)
Fix missing change from commit f8f84b2dfda5
("btrfs: index check-integrity state hash by a dev_t").

Function btrfsic_dev_state_hashtable_lookup uses dev_t to generate hashval
when look in up a btrfsic_dev_state in hash table. So when we add a
btrfsic_dev_state into the hash table, it should also use dev_t.

Reproducer of this bug:
Use MOUNT_OPTIONS="-o check_int" when running xfstest, device can not be
mounted successfully. So xfstest can not run.

Signed-off-by: Gu JinXiang <gujx@cn.fujitsu.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/check-integrity.c

index 9db1e7602dfcb99a6d5277ed4fdee57b64a855c4..1fee5fe93484e69a7497c3947630c85a0ee7a32d 100644 (file)
@@ -613,7 +613,7 @@ static void btrfsic_dev_state_hashtable_add(
                struct btrfsic_dev_state_hashtable *h)
 {
        const unsigned int hashval =
-           (((unsigned int)((uintptr_t)ds->bdev)) &
+           (((unsigned int)((uintptr_t)ds->bdev->bd_dev)) &
             (BTRFSIC_DEV2STATE_HASHTABLE_SIZE - 1));
 
        list_add(&ds->collision_resolving_node, h->table + hashval);