diff options
author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2016-01-15 08:37:15 -0500 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2016-01-15 13:28:43 -0500 |
commit | 546bed631203344611f42b2af1d224d2eedb4e6b (patch) | |
tree | 545bad08e026899889863a2482e09a9de3a6f326 | |
parent | b7c47bbb2d1856330f71ba04c8eb03b39aca87cd (diff) |
btrfs: initialize the seq counter in struct btrfs_device
I managed to trigger this:
| INFO: trying to register non-static key.
| the code is fine but needs lockdep annotation.
| turning off the locking correctness validator.
| CPU: 1 PID: 781 Comm: systemd-gpt-aut Not tainted 4.4.0-rt2+ #14
| Hardware name: ARM-Versatile Express
| [<80307cec>] (dump_stack)
| [<80070e98>] (__lock_acquire)
| [<8007184c>] (lock_acquire)
| [<80287800>] (btrfs_ioctl)
| [<8012a8d4>] (do_vfs_ioctl)
| [<8012ac14>] (SyS_ioctl)
so I think that btrfs_device_data_ordered_init() is not invoked behind
a macro somewhere.
Fixes: 7cc8e58d53cd ("Btrfs: fix unprotected device's variants on 32bits machine")
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r-- | fs/btrfs/volumes.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 574a717fcb6e..21fbcedb6542 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c | |||
@@ -232,6 +232,7 @@ static struct btrfs_device *__alloc_device(void) | |||
232 | spin_lock_init(&dev->reada_lock); | 232 | spin_lock_init(&dev->reada_lock); |
233 | atomic_set(&dev->reada_in_flight, 0); | 233 | atomic_set(&dev->reada_in_flight, 0); |
234 | atomic_set(&dev->dev_stats_ccnt, 0); | 234 | atomic_set(&dev->dev_stats_ccnt, 0); |
235 | btrfs_device_data_ordered_init(dev); | ||
235 | INIT_RADIX_TREE(&dev->reada_zones, GFP_NOFS & ~__GFP_DIRECT_RECLAIM); | 236 | INIT_RADIX_TREE(&dev->reada_zones, GFP_NOFS & ~__GFP_DIRECT_RECLAIM); |
236 | INIT_RADIX_TREE(&dev->reada_extents, GFP_NOFS & ~__GFP_DIRECT_RECLAIM); | 237 | INIT_RADIX_TREE(&dev->reada_extents, GFP_NOFS & ~__GFP_DIRECT_RECLAIM); |
237 | 238 | ||