From: Andrew Morton Update reiser4 for dhowells API changes Cc: "Vladimir V. Saveliev" Cc: David Howells Signed-off-by: Andrew Morton --- fs/reiser4/super_ops.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff -puN fs/reiser4/super_ops.c~reiser4-get_sb_dev-fix fs/reiser4/super_ops.c --- a/fs/reiser4/super_ops.c~reiser4-get_sb_dev-fix +++ a/fs/reiser4/super_ops.c @@ -285,7 +285,7 @@ static void reiser4_write_super(struct s * * Returns information about filesystem. */ -static int reiser4_statfs(struct super_block *super, struct kstatfs *statfs) +static int reiser4_statfs(struct dentry *dentry, struct kstatfs *statfs) { sector_t total; sector_t reserved; @@ -293,6 +293,7 @@ static int reiser4_statfs(struct super_b sector_t forroot; sector_t deleted; reiser4_context *ctx; + struct super_block *super = dentry->d_sb; assert("nikita-408", super != NULL); assert("nikita-409", statfs != NULL); @@ -565,12 +566,10 @@ static int fill_super(struct super_block * * Reiser4 mount entry. */ -static struct super_block *reiser4_get_sb(struct file_system_type *fs_type, - int flags, - const char *dev_name, - void *data) +static int reiser4_get_sb(struct file_system_type *fs_type, int flags, + const char *dev_name, void *data, struct vfsmount *mnt) { - return get_sb_bdev(fs_type, flags, dev_name, data, fill_super); + return get_sb_bdev(fs_type, flags, dev_name, data, fill_super, mnt); } /* structure describing the reiser4 filesystem implementation */ _