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

Commit 19fd6231 authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds
Browse files

mm: spinlock tree_lock 



mapping->tree_lock has no read lockers.  convert the lock from an rwlock
to a spinlock.

Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Hugh Dickins <hugh@veritas.com>
Cc: "Paul E. McKenney" <paulmck@us.ibm.com>
Reviewed-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a60637c8

fs/buffer.c

+2 −2
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ static int __set_page_dirty(struct page *page, 
	if (TestSetPageDirty(page))

		return 0;



	write_lock_irq(&mapping->tree_lock);

	spin_lock_irq(&mapping->tree_lock);

	if (page->mapping) {	/* Race with truncate? */

		WARN_ON_ONCE(warn && !PageUptodate(page));
@@ -719,7 +719,7 @@ static int __set_page_dirty(struct page *page, 
		radix_tree_tag_set(&mapping->page_tree,

				page_index(page), PAGECACHE_TAG_DIRTY);

	}

	write_unlock_irq(&mapping->tree_lock);

	spin_unlock_irq(&mapping->tree_lock);

	__mark_inode_dirty(mapping->host, I_DIRTY_PAGES);



	return 1;

fs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ void inode_init_once(struct inode *inode) 
	INIT_LIST_HEAD(&inode->i_dentry);

	INIT_LIST_HEAD(&inode->i_devices);

	INIT_RADIX_TREE(&inode->i_data.page_tree, GFP_ATOMIC);

	rwlock_init(&inode->i_data.tree_lock);

	spin_lock_init(&inode->i_data.tree_lock);

	spin_lock_init(&inode->i_data.i_mmap_lock);

	INIT_LIST_HEAD(&inode->i_data.private_list);

	spin_lock_init(&inode->i_data.private_lock);

include/asm-arm/cacheflush.h

+2 −2
Original line number Diff line number Diff line
@@ -424,9 +424,9 @@ static inline void flush_anon_page(struct vm_area_struct *vma, 
}



#define flush_dcache_mmap_lock(mapping) \

	write_lock_irq(&(mapping)->tree_lock)

	spin_lock_irq(&(mapping)->tree_lock)

#define flush_dcache_mmap_unlock(mapping) \

	write_unlock_irq(&(mapping)->tree_lock)

	spin_unlock_irq(&(mapping)->tree_lock)



#define flush_icache_user_range(vma,page,addr,len) \

	flush_dcache_page(page)

include/asm-parisc/cacheflush.h

+2 −2
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ void flush_cache_mm(struct mm_struct *mm); 
extern void flush_dcache_page(struct page *page);



#define flush_dcache_mmap_lock(mapping) \

	write_lock_irq(&(mapping)->tree_lock)

	spin_lock_irq(&(mapping)->tree_lock)

#define flush_dcache_mmap_unlock(mapping) \

	write_unlock_irq(&(mapping)->tree_lock)

	spin_unlock_irq(&(mapping)->tree_lock)



#define flush_icache_page(vma,page)	do { 		\

	flush_kernel_dcache_page(page);			\

include/linux/fs.h

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ struct backing_dev_info; 
struct address_space {

	struct inode		*host;		/* owner: inode, block_device */

	struct radix_tree_root	page_tree;	/* radix tree of all pages */

	rwlock_t		tree_lock;	/* and rwlock protecting it */

	spinlock_t		tree_lock;	/* and lock protecting it */

	unsigned int		i_mmap_writable;/* count VM_SHARED mappings */

	struct prio_tree_root	i_mmap;		/* tree of private and shared mappings */

	struct list_head	i_mmap_nonlinear;/*list VM_NONLINEAR mappings */