diff --git a/[refs] b/[refs]
index bb1728ddbef0..e94f289fc284 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3314a0ed389f51a51695120b429eccd45b3a165
+refs/heads/master: 309f77ad9bea057d55b04580b5a711e9e3727e83
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
index 74566c6f67b1..d895d9fd5b71 100644
--- a/trunk/fs/buffer.c
+++ b/trunk/fs/buffer.c
@@ -2458,11 +2458,10 @@ int nobh_write_begin(struct address_space *mapping,
 	*fsdata = NULL;
 
 	if (page_has_buffers(page)) {
-		unlock_page(page);
-		page_cache_release(page);
-		*pagep = NULL;
-		return block_write_begin(mapping, pos, len, flags, pagep,
-					 get_block);
+		ret = __block_write_begin(page, pos, len, get_block);
+		if (unlikely(ret))
+			goto out_release;
+		return ret;
 	}
 
 	if (PageMappedToDisk(page))