diff options
| author | Gu JinXiang <gujx@cn.fujitsu.com> | 2017-10-11 16:44:27 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-10-30 12:28:01 +0100 |
| commit | 859a58a2074858dc03943c1fa1a2975576f9b0b8 (patch) | |
| tree | 6400bcd2a44b88c3df0d5fa86b5b73347b007fcc /fs/btrfs | |
| parent | 102ed2c5ff932439bbbe74c7bd63e6d5baa9f732 (diff) | |
| download | linux-859a58a2074858dc03943c1fa1a2975576f9b0b8.tar.gz linux-859a58a2074858dc03943c1fa1a2975576f9b0b8.tar.bz2 linux-859a58a2074858dc03943c1fa1a2975576f9b0b8.zip | |
btrfs: Use bd_dev to generate index when dev_state_hashtable add items.
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>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/check-integrity.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index 9db1e7602dfc..1fee5fe93484 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c @@ -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); |