Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...

[pandora-kernel.git] / fs / exofs / exofs.h

diff --git a/fs/exofs/exofs.h b/fs/exofs/exofs.h
index acfebd3..8442e35 100644 (file)
--- a/fs/exofs/exofs.h
+++ b/fs/exofs/exofs.h
@@ -63,6 +63,8 @@ struct exofs_layout {
        unsigned mirrors_p1;
 
        unsigned group_width;
+       u64      group_depth;
+       unsigned group_count;
 
        enum exofs_inode_layout_gen_functions lay_func;
 
@@ -132,6 +134,7 @@ struct exofs_io_state {
        struct page             **pages;
        unsigned                nr_pages;
        unsigned                pgbase;
+       unsigned                pages_consumed;
 
        /* Attributes */
        unsigned                in_attr_len;
@@ -258,7 +261,7 @@ int exofs_write_begin(struct file *file, struct address_space *mapping,
                struct page **pagep, void **fsdata);
 extern struct inode *exofs_iget(struct super_block *, unsigned long);
 struct inode *exofs_new_inode(struct inode *, int);
-extern int exofs_write_inode(struct inode *, int);
+extern int exofs_write_inode(struct inode *, struct writeback_control *wbc);
 extern void exofs_delete_inode(struct inode *);
 
 /* dir.c:                */