---

yaml --- r: 276167 b: refs/heads/master c: c7e25e6 h: refs/heads/master i: 276165: a89748c 276163: 7d2ce35 276159: c9355d9 v: v3
git-mirror · Jul 28, 2011 · cfa418c · cfa418c
1 parent ed81775
commit cfa418c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a11f7e63c59810a81494d4c4b028af707d4c7ca4
+refs/heads/master: c7e25e6e0b0486492c5faaf6312b37413642c48e
diff --git a/trunk/fs/ocfs2/aops.c b/trunk/fs/ocfs2/aops.c
@@ -290,7 +290,15 @@ static int ocfs2_readpage(struct file *file, struct page *page)
 	}
 
 	if (down_read_trylock(&oi->ip_alloc_sem) == 0) {
+		/*
+		 * Unlock the page and cycle ip_alloc_sem so that we don't
+		 * busyloop waiting for ip_alloc_sem to unlock
+		 */
 		ret = AOP_TRUNCATED_PAGE;
+		unlock_page(page);
+		unlock = 0;
+		down_read(&oi->ip_alloc_sem);
+		up_read(&oi->ip_alloc_sem);
 		goto out_inode_unlock;
 	}