]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Staging: lustre: Replace non-standard spinlock macro definations
authorVaishali Thakkar <vthakkar1994@gmail.com>
Sun, 5 Oct 2014 11:58:12 +0000 (17:28 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Oct 2014 02:29:09 +0000 (10:29 +0800)
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 <vthakkar1994@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/llite/llite_lib.c

index a8bcc51057f19306b3b31605a1c1af5d83c8a6b6..d614752c4c209964c7c6c2a73940e8a430b379b1 100644 (file)
@@ -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",