Commit 12afe493 authored by Vaishali Thakkar's avatar Vaishali Thakkar Committed by Greg Kroah-Hartman
Browse files

Staging: lustre: Replace non-standard spin-lock's macro 



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)

Signed-off-by: default avatarVaishali Thakkar <vthakkar1994@gmail.com>
Acked-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4a1b86dc

drivers/staging/lustre/lustre/llite/dir.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -275,14 +275,14 @@ static struct page *ll_dir_page_locate(struct inode *dir, __u64 *hash, 
	struct page *page;

	struct page *page;

	int found;

	int found;





	TREE_READ_LOCK_IRQ(mapping);

	spin_lock_irq(&mapping->tree_lock);

	found = radix_tree_gang_lookup(&mapping->page_tree,

	found = radix_tree_gang_lookup(&mapping->page_tree,

				       (void **)&page, offset, 1);

				       (void **)&page, offset, 1);

	if (found > 0) {

	if (found > 0) {

		struct lu_dirpage *dp;

		struct lu_dirpage *dp;





		page_cache_get(page);

		page_cache_get(page);

		TREE_READ_UNLOCK_IRQ(mapping);

		spin_unlock_irq(&mapping->tree_lock);

		/*

		/*

		 * In contrast to find_lock_page() we are sure that directory

		 * In contrast to find_lock_page() we are sure that directory

		 * page cannot be truncated (while DLM lock is held) and,

		 * page cannot be truncated (while DLM lock is held) and,
@@ -326,7 +326,7 @@ static struct page *ll_dir_page_locate(struct inode *dir, __u64 *hash, 
		}

		}





	} else {

	} else {

		TREE_READ_UNLOCK_IRQ(mapping);

		spin_unlock_irq(&mapping->tree_lock);

		page = NULL;

		page = NULL;

	}

	}

	return page;

	return page;