Merge commit 'origin/master' into next

[deliverable/linux.git] / fs / libfs.c

diff --git a/fs/libfs.c b/fs/libfs.c
index 7de05f7ce746d31dbb18374ba5ef8a37804392ef..49b44099dabbb9cef010c2394c8ba110440edee4 100644 (file)
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -359,7 +359,7 @@ int simple_write_begin(struct file *file, struct address_space *mapping,
        index = pos >> PAGE_CACHE_SHIFT;
        from = pos & (PAGE_CACHE_SIZE - 1);
 
-       page = __grab_cache_page(mapping, index);
+       page = grab_cache_page_write_begin(mapping, index, flags);
        if (!page)
                return -ENOMEM;