iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert nilfs

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2010-07-26 12:19:34 +04:00
parent a1da9e8ab6
commit e4c59d61e8
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/nilfs2/super.c
View File

@ -1141,9 +1141,9 @@ static int nilfs_test_bdev_super(struct super_block *s, void *data)
return (void *)s->s_bdev == data; return (void *)s->s_bdev == data;
} }
static int static struct dentry *
nilfs_get_sb(struct file_system_type *fs_type, int flags, nilfs_mount(struct file_system_type *fs_type, int flags,
const char *dev_name, void *data, struct vfsmount *mnt) const char *dev_name, void *data)
{ {
struct nilfs_super_data sd; struct nilfs_super_data sd;
struct super_block *s; struct super_block *s;
@ -1156,7 +1156,7 @@ nilfs_get_sb(struct file_system_type *fs_type, int flags,
sd.bdev = open_bdev_exclusive(dev_name, mode, fs_type); sd.bdev = open_bdev_exclusive(dev_name, mode, fs_type);
if (IS_ERR(sd.bdev)) if (IS_ERR(sd.bdev))
return PTR_ERR(sd.bdev); return ERR_CAST(sd.bdev);
sd.cno = 0; sd.cno = 0;
sd.flags = flags; sd.flags = flags;
@ -1235,9 +1235,7 @@ nilfs_get_sb(struct file_system_type *fs_type, int flags,
if (!s_new) if (!s_new)
close_bdev_exclusive(sd.bdev, mode); close_bdev_exclusive(sd.bdev, mode);
mnt->mnt_sb = s; return root_dentry;
mnt->mnt_root = root_dentry;
return 0;
failed_super: failed_super:
deactivate_locked_super(s); deactivate_locked_super(s);
@ -1245,13 +1243,13 @@ nilfs_get_sb(struct file_system_type *fs_type, int flags,
failed: failed:
if (!s_new) if (!s_new)
close_bdev_exclusive(sd.bdev, mode); close_bdev_exclusive(sd.bdev, mode);
return err; return ERR_PTR(err);
} }
struct file_system_type nilfs_fs_type = { struct file_system_type nilfs_fs_type = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "nilfs2", .name = "nilfs2",
.get_sb = nilfs_get_sb, .mount = nilfs_mount,
.kill_sb = kill_block_super, .kill_sb = kill_block_super,
.fs_flags = FS_REQUIRES_DEV, .fs_flags = FS_REQUIRES_DEV,
}; };