diff --git a/[refs] b/[refs]
index cf1d26e83d19..2b0000cb654a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 552fca4cbe552520d85b21e839f289c880fa48d2
+refs/heads/master: de7d5a3b6c9ff8429bf046c36b56d3192b75c3da
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
index 3b12cf947aba..665db84a1f9f 100644
--- a/trunk/fs/buffer.c
+++ b/trunk/fs/buffer.c
@@ -2917,7 +2917,7 @@ drop_buffers(struct page *page, struct buffer_head **buffers_to_free)
 
 	bh = head;
 	do {
-		if (buffer_write_io_error(bh))
+		if (buffer_write_io_error(bh) && page->mapping)
 			set_bit(AS_EIO, &page->mapping->flags);
 		if (buffer_busy(bh))
 			goto failed;