fs/buffer.c: call __block_write_begin() if we have page

[net-next-2.6.git] / fs / buffer.c

diff --git a/fs/buffer.c b/fs/buffer.c
index 74566c6f67b17816dc89c78be8a26d1507454e74..d895d9fd5b715ca1405c35cc47d42ec489c09aa5 100644 (file)
--- a/fs/buffer.c
+++ b/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))