---

yaml --- r: 156993 b: refs/heads/master c: 8e9d78e h: refs/heads/master i: 156991: 3cba487 v: v3
git-mirror · Aug 22, 2009 · df9ed23 · df9ed23
1 parent a003387
commit df9ed23
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dfd79e7b42bff334128907e28c3b41f1ef1cec8
+refs/heads/master: 8e9d78edea3ce5c0036f85b93091483f2f15443a
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
@@ -1165,8 +1165,11 @@ void mark_buffer_dirty(struct buffer_head *bh)
 
 	if (!test_set_buffer_dirty(bh)) {
 		struct page *page = bh->b_page;
-		if (!TestSetPageDirty(page))
-			__set_page_dirty(page, page_mapping(page), 0);
+		if (!TestSetPageDirty(page)) {
+			struct address_space *mapping = page_mapping(page);
+			if (mapping)
+				__set_page_dirty(page, mapping, 0);
+		}
 	}
 }