| Message ID | 20191113102728.8835-7-jthumshirn@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/7] btrfs: decrement number of open devices after closing the device not before | expand |
On 13/11/19 6:27 PM, Johannes Thumshirn wrote: > struct btrfs_fs_devices::seeding currently is declared as an integer > variable but only used as a boolean. > > Change the variable definition to bool and update to code touching it to > set 'true' and 'false'. > > Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> Nit: Re: [PATCH v2 6/7] btrfs: change btrfs_fs_devices::seeing to bool ^d Reviewed-by: Anand Jain <anand.jain@oracle.com> Thanks, Anand > --- > fs/btrfs/volumes.c | 8 ++++---- > fs/btrfs/volumes.h | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c > index 25e4608e20f1..ce9c6fa3a32c 100644 > --- a/fs/btrfs/volumes.c > +++ b/fs/btrfs/volumes.c > @@ -634,7 +634,7 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices, > } > > clear_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state); > - fs_devices->seeding = 1; > + fs_devices->seeding = true; > } else { > if (bdev_read_only(bdev)) > clear_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state); > @@ -1139,7 +1139,7 @@ static int close_fs_devices(struct btrfs_fs_devices *fs_devices) > WARN_ON(fs_devices->open_devices); > WARN_ON(fs_devices->rw_devices); > fs_devices->opened = 0; > - fs_devices->seeding = 0; > + fs_devices->seeding = false; > > return 0; > } > @@ -2297,7 +2297,7 @@ static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info) > list_splice_init(&fs_devices->alloc_list, &seed_devices->alloc_list); > mutex_unlock(&fs_info->chunk_mutex); > > - fs_devices->seeding = 0; > + fs_devices->seeding = false; > fs_devices->num_devices = 0; > fs_devices->open_devices = 0; > fs_devices->missing_devices = 0; > @@ -6681,7 +6681,7 @@ static struct btrfs_fs_devices *open_seed_devices(struct btrfs_fs_info *fs_info, > if (IS_ERR(fs_devices)) > return fs_devices; > > - fs_devices->seeding = 1; > + fs_devices->seeding = true; > fs_devices->opened = 1; > return fs_devices; > } > diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h > index 46987a2da786..8e9513b3fe9d 100644 > --- a/fs/btrfs/volumes.h > +++ b/fs/btrfs/volumes.h > @@ -243,7 +243,7 @@ struct btrfs_fs_devices { > struct list_head alloc_list; > > struct btrfs_fs_devices *seed; > - int seeding; > + bool seeding; > > int opened; > >
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 25e4608e20f1..ce9c6fa3a32c 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -634,7 +634,7 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices, } clear_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state); - fs_devices->seeding = 1; + fs_devices->seeding = true; } else { if (bdev_read_only(bdev)) clear_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state); @@ -1139,7 +1139,7 @@ static int close_fs_devices(struct btrfs_fs_devices *fs_devices) WARN_ON(fs_devices->open_devices); WARN_ON(fs_devices->rw_devices); fs_devices->opened = 0; - fs_devices->seeding = 0; + fs_devices->seeding = false; return 0; } @@ -2297,7 +2297,7 @@ static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info) list_splice_init(&fs_devices->alloc_list, &seed_devices->alloc_list); mutex_unlock(&fs_info->chunk_mutex); - fs_devices->seeding = 0; + fs_devices->seeding = false; fs_devices->num_devices = 0; fs_devices->open_devices = 0; fs_devices->missing_devices = 0; @@ -6681,7 +6681,7 @@ static struct btrfs_fs_devices *open_seed_devices(struct btrfs_fs_info *fs_info, if (IS_ERR(fs_devices)) return fs_devices; - fs_devices->seeding = 1; + fs_devices->seeding = true; fs_devices->opened = 1; return fs_devices; } diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index 46987a2da786..8e9513b3fe9d 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -243,7 +243,7 @@ struct btrfs_fs_devices { struct list_head alloc_list; struct btrfs_fs_devices *seed; - int seeding; + bool seeding; int opened;
struct btrfs_fs_devices::seeding currently is declared as an integer variable but only used as a boolean. Change the variable definition to bool and update to code touching it to set 'true' and 'false'. Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> --- fs/btrfs/volumes.c | 8 ++++---- fs/btrfs/volumes.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)