---

yaml --- r: 163671 b: refs/heads/master c: a827eaf h: refs/heads/master i: 163669: f8d02bb 163667: c9a361a 163663: 23b5ef9 v: v3
git-mirror · Sep 10, 2009 · f019b03 · f019b03
1 parent b95b117
commit f019b03
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44fc48f7048ab9657b524938a832fec4e0acea98
+refs/heads/master: a827eaffff07c7d58a4cb32158cbeb4849f4e33a
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
@@ -5286,12 +5286,21 @@ int ext4_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
 	else
 		len = PAGE_CACHE_SIZE;
 
+	lock_page(page);
+	/*
+	 * return if we have all the buffers mapped. This avoid
+	 * the need to call write_begin/write_end which does a
+	 * journal_start/journal_stop which can block and take
+	 * long time
+	 */
 	if (page_has_buffers(page)) {
-		/* return if we have all the buffers mapped */
 		if (!walk_page_buffers(NULL, page_buffers(page), 0, len, NULL,
-				       ext4_bh_unmapped))
+					ext4_bh_unmapped)) {
+			unlock_page(page);
 			goto out_unlock;
+		}
 	}
+	unlock_page(page);
 	/*
 	 * OK, we need to fill the hole... Do write_begin write_end
 	 * to do block allocation/reservation.We are not holding