From c4226c547f3c1e69989f843cf8d3d7b2f295ad3f Mon Sep 17 00:00:00 2001 From: Vaishali Thakkar Date: Sun, 5 Oct 2014 17:28:12 +0530 Subject: [PATCH] Staging: lustre: Replace non-standard spinlock macro definations This patch replaces non-standard spin lock macro with standard linux function. This is done using Coccinelle and semantic patch used is as follows: @@ expression x; @@ - TREE_READ_LOCK_IRQ(x) + spin_lock_irq(&(x)->tree_lock) @@ expression x; @@ - TREE_READ_UNLOCK_IRQ(x) + spin_unlock_irq(&(x)->tree_lock) Also semantic patch result is modified by droping ->, inner & and adding . for simplification of code. Signed-off-by: Vaishali Thakkar Acked-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lustre/llite/llite_lib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c index a8bcc51057f1..d614752c4c20 100644 --- a/drivers/staging/lustre/lustre/llite/llite_lib.c +++ b/drivers/staging/lustre/lustre/llite/llite_lib.c @@ -1880,8 +1880,8 @@ void ll_delete_inode(struct inode *inode) /* Workaround for LU-118 */ if (inode->i_data.nrpages) { - TREE_READ_LOCK_IRQ(&inode->i_data); - TREE_READ_UNLOCK_IRQ(&inode->i_data); + spin_lock_irq(&inode->i_data.tree_lock); + spin_unlock_irq(&inode->i_data.tree_lock); LASSERTF(inode->i_data.nrpages == 0, "inode=%lu/%u(%p) nrpages=%lu, see " "http://jira.whamcloud.com/browse/LU-118\n", -- 2.20.1