fs: restore nobh
[linux-2.6.git] / fs / ext2 / inode.c
index 63ab02aa4c528a4b4d19928f4c97582d78cdf05a..1b102a1ccebb373761b02194cc2b138a2f194cf0 100644 (file)
@@ -659,6 +659,20 @@ ext2_write_begin(struct file *file, struct address_space *mapping,
        return __ext2_write_begin(file, mapping, pos, len, flags, pagep,fsdata);
 }
 
+static int
+ext2_nobh_write_begin(struct file *file, struct address_space *mapping,
+               loff_t pos, unsigned len, unsigned flags,
+               struct page **pagep, void **fsdata)
+{
+       /*
+        * Dir-in-pagecache still uses ext2_write_begin. Would have to rework
+        * directory handling code to pass around offsets rather than struct
+        * pages in order to make this work easily.
+        */
+       return nobh_write_begin(file, mapping, pos, len, flags, pagep, fsdata,
+                                                       ext2_get_block);
+}
+
 static int ext2_nobh_writepage(struct page *page,
                        struct writeback_control *wbc)
 {
@@ -710,7 +724,8 @@ const struct address_space_operations ext2_nobh_aops = {
        .readpages              = ext2_readpages,
        .writepage              = ext2_nobh_writepage,
        .sync_page              = block_sync_page,
-       /* XXX: todo */
+       .write_begin            = ext2_nobh_write_begin,
+       .write_end              = nobh_write_end,
        .bmap                   = ext2_bmap,
        .direct_IO              = ext2_direct_IO,
        .writepages             = ext2_writepages,
@@ -927,7 +942,8 @@ void ext2_truncate (struct inode * inode)
        if (mapping_is_xip(inode->i_mapping))
                xip_truncate_page(inode->i_mapping, inode->i_size);
        else if (test_opt(inode->i_sb, NOBH))
-               nobh_truncate_page(inode->i_mapping, inode->i_size);
+               nobh_truncate_page(inode->i_mapping,
+                               inode->i_size, ext2_get_block);
        else
                block_truncate_page(inode->i_mapping,
                                inode->i_size, ext2_get_block);