UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Peng Tao <peng_tao@emc.com>
Signed-off-by: Benny Halevy <bhalevy@tonian.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Peng Tao 2012-01-12 23:18:47 +08:00 committed by Trond Myklebust
parent 57582b372f
commit 93a3844ee0
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/nfs/blocklayout/blocklayout.c
View File

@ -780,16 +780,13 @@ bl_cleanup_layoutcommit(struct nfs4_layoutcommit_data *lcdata)
static void free_blk_mountid(struct block_mount_id *mid) static void free_blk_mountid(struct block_mount_id *mid)
{ {
if (mid) { if (mid) {
struct pnfs_block_dev *dev; struct pnfs_block_dev *dev, *tmp;
spin_lock(&mid->bm_lock);
while (!list_empty(&mid->bm_devlist)) { /* No need to take bm_lock as we are last user freeing bm_devlist */
dev = list_first_entry(&mid->bm_devlist, list_for_each_entry_safe(dev, tmp, &mid->bm_devlist, bm_node) {
struct pnfs_block_dev,
bm_node);
list_del(&dev->bm_node); list_del(&dev->bm_node);
bl_free_block_dev(dev); bl_free_block_dev(dev);
} }
spin_unlock(&mid->bm_lock);
kfree(mid); kfree(mid);
} }
} }