| Message ID | 1407750176-15853-1-git-send-email-anand.jain@oracle.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Mon, 11 Aug 2014 17:42:53 +0800, Anand Jain wrote: > There is no logical change in this patch, just a preparatory patch, > so that changes can be easily reasoned. > > Signed-off-by: Anand Jain <anand.jain@oracle.com> > --- > fs/btrfs/volumes.c | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c > index 5f634b6..5fd0132 100644 > --- a/fs/btrfs/volumes.c > +++ b/fs/btrfs/volumes.c > @@ -1960,19 +1960,23 @@ error_undo: > void btrfs_rm_dev_replace_srcdev(struct btrfs_fs_info *fs_info, > struct btrfs_device *srcdev) > { > + struct btrfs_fs_devices *fs_devices; > + > WARN_ON(!mutex_is_locked(&fs_info->fs_devices->device_list_mutex)); > > + fs_devices = fs_info->fs_devices; > + > list_del_rcu(&srcdev->dev_list); > list_del_rcu(&srcdev->dev_alloc_list); > - fs_info->fs_devices->num_devices--; > + fs_devices->num_devices--; > if (srcdev->missing) { > - fs_info->fs_devices->missing_devices--; > - fs_info->fs_devices->rw_devices++; > + fs_devices->missing_devices--; > + fs_devices->rw_devices++; > } > if (srcdev->can_discard) > - fs_info->fs_devices->num_can_discard--; > + fs_devices->num_can_discard--; > if (srcdev->bdev) { > - fs_info->fs_devices->open_devices--; > + fs_devices->open_devices--; > > /* > * zero out the old super if it is not writable > Reviewed-by: Miao Xie <miaox@cn.fujitsu.com> -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 5f634b6..5fd0132 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1960,19 +1960,23 @@ error_undo: void btrfs_rm_dev_replace_srcdev(struct btrfs_fs_info *fs_info, struct btrfs_device *srcdev) { + struct btrfs_fs_devices *fs_devices; + WARN_ON(!mutex_is_locked(&fs_info->fs_devices->device_list_mutex)); + fs_devices = fs_info->fs_devices; + list_del_rcu(&srcdev->dev_list); list_del_rcu(&srcdev->dev_alloc_list); - fs_info->fs_devices->num_devices--; + fs_devices->num_devices--; if (srcdev->missing) { - fs_info->fs_devices->missing_devices--; - fs_info->fs_devices->rw_devices++; + fs_devices->missing_devices--; + fs_devices->rw_devices++; } if (srcdev->can_discard) - fs_info->fs_devices->num_can_discard--; + fs_devices->num_can_discard--; if (srcdev->bdev) { - fs_info->fs_devices->open_devices--; + fs_devices->open_devices--; /* * zero out the old super if it is not writable
There is no logical change in this patch, just a preparatory patch, so that changes can be easily reasoned. Signed-off-by: Anand Jain <anand.jain@oracle.com> --- fs/btrfs/volumes.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)