Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f5316c1 authored by Liu Bo's avatar Liu Bo Committed by David Sterba
Browse files

Btrfs: free btrfs_device in place 



It's pointless to defer it to a kthread helper as we're not under a
special context.

For reference, commit 1f78160c ("Btrfs: using rcu lock in the reader
side of devices list") introduced RCU freeing for device structures.

Originally the blkdev_put was called from free_device and rcu_barrier had
to be called. This is no longer required, bdev and our device structures
are now freed separately.

Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
[ enhance changelog ]
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 1805f2ca

fs/btrfs/volumes.c

+2 −12
Original line number Diff line number Diff line
@@ -824,26 +824,16 @@ void btrfs_close_extra_devices(struct btrfs_fs_devices *fs_devices, int step) 
	mutex_unlock(&uuid_mutex);

}



static void __free_device(struct work_struct *work)

static void free_device(struct rcu_head *head)

{

	struct btrfs_device *device;



	device = container_of(work, struct btrfs_device, rcu_work);

	device = container_of(head, struct btrfs_device, rcu);

	rcu_string_free(device->name);

	bio_put(device->flush_bio);

	kfree(device);

}



static void free_device(struct rcu_head *head)

{

	struct btrfs_device *device;



	device = container_of(head, struct btrfs_device, rcu);



	INIT_WORK(&device->rcu_work, __free_device);

	schedule_work(&device->rcu_work);

}



static void btrfs_close_bdev(struct btrfs_device *device)

{

	if (device->bdev && device->writeable) {

fs/btrfs/volumes.h

+0 −1
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ struct btrfs_device { 


	struct btrfs_work work;

	struct rcu_head rcu;

	struct work_struct rcu_work;



	/* readahead state */

	spinlock_t reada_lock;