commit 6258d92b7532798599e7699ef04340310640e201
author Linux Build Service Account <lnxbuild@localhost> Wed Mar 12 02:19:38 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Mar 12 02:19:37 2014 -0700
tree 325793b32ab462b72ecf410dd21e7ae2daee5f7f
parent d9c74020a559bc9719206295b495fe382b2cd1cd
parent 03e970672c8e3868a29b7b2079ce1fed61073338

Merge "staging: android: ashmem: Avoid deadlock with mmap/shrink"

drivers/staging/android/ashmem.c

diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c
index 7ca247a..41ebc1c 100644
--- a/drivers/staging/android/ashmem.c
+++ b/drivers/staging/android/ashmem.c
@@ -365,7 +365,9 @@
 	if (!sc->nr_to_scan)
 		return lru_count;
 
-	mutex_lock(&ashmem_mutex);
+	if (!mutex_trylock(&ashmem_mutex))
+		return -1;
+
 	list_for_each_entry_safe(range, next, &ashmem_lru_list, lru) {
 		struct inode *inode = range->asma->file->f_dentry->d_inode;
 		loff_t start = range->pgstart * PAGE_SIZE;