return 0;
 }
 
-static int bget_one(handle_t *handle, struct inode *inode,
-                   struct buffer_head *bh)
-{
-       get_bh(bh);
-       return 0;
-}
-
-static int bput_one(handle_t *handle, struct inode *inode,
-                   struct buffer_head *bh)
-{
-       put_bh(bh);
-       return 0;
-}
-
 static int __ext4_journalled_writepage(struct page *page,
                                       unsigned int len)
 {
        struct address_space *mapping = page->mapping;
        struct inode *inode = mapping->host;
-       struct buffer_head *page_bufs = NULL;
        handle_t *handle = NULL;
        int ret = 0, err = 0;
        int inline_data = ext4_has_inline_data(inode);
        struct buffer_head *inode_bh = NULL;
+       loff_t size;
 
        ClearPageChecked(page);
 
                inode_bh = ext4_journalled_write_inline_data(inode, len, page);
                if (inode_bh == NULL)
                        goto out;
-       } else {
-               page_bufs = page_buffers(page);
-               if (!page_bufs) {
-                       BUG();
-                       goto out;
-               }
-               ext4_walk_page_buffers(handle, inode, page_bufs, 0, len,
-                                      NULL, bget_one);
        }
        /*
         * We need to release the page lock before we start the
 
        lock_page(page);
        put_page(page);
-       if (page->mapping != mapping) {
+       size = i_size_read(inode);
+       if (page->mapping != mapping || page_offset(page) > size) {
                /* The page got truncated from under us */
                ext4_journal_stop(handle);
                ret = 0;
        if (inline_data) {
                ret = ext4_mark_inode_dirty(handle, inode);
        } else {
+               struct buffer_head *page_bufs = page_buffers(page);
+
+               if (page->index == size >> PAGE_SHIFT)
+                       len = size & ~PAGE_MASK;
+               else
+                       len = PAGE_SIZE;
+
                ret = ext4_walk_page_buffers(handle, inode, page_bufs, 0, len,
                                             NULL, do_journal_get_write_access);
 
 out:
        unlock_page(page);
 out_no_pagelock:
-       if (!inline_data && page_bufs)
-               ext4_walk_page_buffers(NULL, inode, page_bufs, 0, len,
-                                      NULL, bput_one);
        brelse(inode_bh);
        return ret;
 }