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

Commit 93a3844e authored by Peng Tao's avatar Peng Tao Committed by Trond Myklebust
Browse files

pnfsblock: don't spinlock when freeing block_dev 



bl_free_block_dev() may sleep. We can not call it with spinlock held.
Besides, there is no need to take bm_lock as we are last user freeing bm_devlist.

Cc: <stable@vger.kernel.org> #3.1+
Signed-off-by: default avatarPeng Tao <peng_tao@emc.com>
Signed-off-by: default avatarBenny Halevy <bhalevy@tonian.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 57582b37

fs/nfs/blocklayout/blocklayout.c

+4 −7
Original line number Diff line number Diff line
@@ -780,16 +780,13 @@ bl_cleanup_layoutcommit(struct nfs4_layoutcommit_data *lcdata) 
static void free_blk_mountid(struct block_mount_id *mid)

{

	if (mid) {

		struct pnfs_block_dev *dev;

		spin_lock(&mid->bm_lock);

		while (!list_empty(&mid->bm_devlist)) {

			dev = list_first_entry(&mid->bm_devlist,

					       struct pnfs_block_dev,

					       bm_node);

		struct pnfs_block_dev *dev, *tmp;



		/* No need to take bm_lock as we are last user freeing bm_devlist */

		list_for_each_entry_safe(dev, tmp, &mid->bm_devlist, bm_node) {

			list_del(&dev->bm_node);

			bl_free_block_dev(dev);

		}

		spin_unlock(&mid->bm_lock);

		kfree(mid);

	}

}