Merge branch 'master' into tk71

[mv-sheeva.git] / fs / nilfs2 / dat.h

diff --git a/fs/nilfs2/dat.h b/fs/nilfs2/dat.h
index d31c3aab0efefb7cb64bd7070feee322a17469a8..cbd8e973250304973b67370cd73236ab923866d1 100644 (file)
--- a/fs/nilfs2/dat.h
+++ b/fs/nilfs2/dat.h
@@ -53,7 +53,7 @@ int nilfs_dat_freev(struct inode *, __u64 *, size_t);
 int nilfs_dat_move(struct inode *, __u64, sector_t);
 ssize_t nilfs_dat_get_vinfo(struct inode *, void *, unsigned, size_t);
 
-int nilfs_dat_read(struct inode *dat, struct nilfs_inode *raw_inode);
-struct inode *nilfs_dat_new(struct the_nilfs *nilfs, size_t entry_size);
+int nilfs_dat_read(struct super_block *sb, size_t entry_size,
+                  struct nilfs_inode *raw_inode, struct inode **inodep);
 
 #endif /* _NILFS_DAT_H */