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

Commit f6f93f75 authored by 夷则(Caspar)'s avatar 夷则(Caspar) Committed by Michael S. Tsirkin
Browse files

vhost: remove unused lock check flag in vhost_dev_cleanup() 



In commit ea5d4046 ("vhost: fix release path lockdep checks"),
Michael added a flag to check whether we should hold a lock in
vhost_dev_cleanup(), however, in commit 47283bef ("vhost: move
memory pointer to VQs"), RCU operations have been replaced by
mutex, we can remove the no-longer-used `locked' parameter now.

Signed-off-by: default avatarCaspar Zhang <jinli.zjl@alibaba-inc.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent ac964d7a

drivers/vhost/net.c

+1 −1
Original line number Diff line number Diff line
@@ -996,7 +996,7 @@ static int vhost_net_release(struct inode *inode, struct file *f) 
	vhost_net_stop(n, &tx_sock, &rx_sock);

	vhost_net_flush(n);

	vhost_dev_stop(&n->dev);

	vhost_dev_cleanup(&n->dev, false);

	vhost_dev_cleanup(&n->dev);

	vhost_net_vq_reset(n);

	if (tx_sock)

		sockfd_put(tx_sock);

drivers/vhost/scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1419,7 +1419,7 @@ static int vhost_scsi_release(struct inode *inode, struct file *f) 
	mutex_unlock(&vs->dev.mutex);

	vhost_scsi_clear_endpoint(vs, &t);

	vhost_dev_stop(&vs->dev);

	vhost_dev_cleanup(&vs->dev, false);

	vhost_dev_cleanup(&vs->dev);

	/* Jobs can re-queue themselves in evt kick handler. Do extra flush. */

	vhost_scsi_flush(vs);

	kfree(vs->dev.vqs);

drivers/vhost/test.c

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static int vhost_test_release(struct inode *inode, struct file *f) 


	vhost_test_stop(n, &private);

	vhost_test_flush(n);

	vhost_dev_cleanup(&n->dev, false);

	vhost_dev_cleanup(&n->dev);

	/* We do an extra flush before freeing memory,

	 * since jobs can re-queue themselves. */

	vhost_test_flush(n);

drivers/vhost/vhost.c

+2 −3
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ void vhost_dev_reset_owner(struct vhost_dev *dev, struct vhost_umem *umem) 
{

	int i;



	vhost_dev_cleanup(dev, true);

	vhost_dev_cleanup(dev);



	/* Restore memory to default empty mapping. */

	INIT_LIST_HEAD(&umem->umem_list);
@@ -610,8 +610,7 @@ static void vhost_clear_msg(struct vhost_dev *dev) 
	spin_unlock(&dev->iotlb_lock);

}



/* Caller should have device mutex if and only if locked is set */

void vhost_dev_cleanup(struct vhost_dev *dev, bool locked)

void vhost_dev_cleanup(struct vhost_dev *dev)

{

	int i;

drivers/vhost/vhost.h

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ bool vhost_dev_has_owner(struct vhost_dev *dev); 
long vhost_dev_check_owner(struct vhost_dev *);

struct vhost_umem *vhost_dev_reset_owner_prepare(void);

void vhost_dev_reset_owner(struct vhost_dev *, struct vhost_umem *);

void vhost_dev_cleanup(struct vhost_dev *, bool locked);

void vhost_dev_cleanup(struct vhost_dev *);

void vhost_dev_stop(struct vhost_dev *);

long vhost_dev_ioctl(struct vhost_dev *, unsigned int ioctl, void __user *argp);

long vhost_vring_ioctl(struct vhost_dev *d, int ioctl, void __user *argp);