Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e4c59d61e80529aebca4a3690b4378f2c6fc4e82

Authored by Al Viro
1 parent a1da9e8ab6
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

convert nilfs 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 1 changed file with 7 additions and 9 deletions Side-by-side Diff

... ... @@ -1141,9 +1141,9 @@
1141 1141 return (void *)s->s_bdev == data;
1142 1142 }
1143 1143  
1144   -static int
1145   -nilfs_get_sb(struct file_system_type *fs_type, int flags,
1146   - const char *dev_name, void *data, struct vfsmount *mnt)
  1144 +static struct dentry *
  1145 +nilfs_mount(struct file_system_type *fs_type, int flags,
  1146 + const char *dev_name, void *data)
1147 1147 {
1148 1148 struct nilfs_super_data sd;
1149 1149 struct super_block *s;
... ... @@ -1156,7 +1156,7 @@
1156 1156  
1157 1157 sd.bdev = open_bdev_exclusive(dev_name, mode, fs_type);
1158 1158 if (IS_ERR(sd.bdev))
1159   - return PTR_ERR(sd.bdev);
  1159 + return ERR_CAST(sd.bdev);
1160 1160  
1161 1161 sd.cno = 0;
1162 1162 sd.flags = flags;
... ... @@ -1235,9 +1235,7 @@
1235 1235 if (!s_new)
1236 1236 close_bdev_exclusive(sd.bdev, mode);
1237 1237  
1238   - mnt->mnt_sb = s;
1239   - mnt->mnt_root = root_dentry;
1240   - return 0;
  1238 + return root_dentry;
1241 1239  
1242 1240 failed_super:
1243 1241 deactivate_locked_super(s);
1244 1242  
... ... @@ -1245,13 +1243,13 @@
1245 1243 failed:
1246 1244 if (!s_new)
1247 1245 close_bdev_exclusive(sd.bdev, mode);
1248   - return err;
  1246 + return ERR_PTR(err);
1249 1247 }
1250 1248  
1251 1249 struct file_system_type nilfs_fs_type = {
1252 1250 .owner = THIS_MODULE,
1253 1251 .name = "nilfs2",
1254   - .get_sb = nilfs_get_sb,
  1252 + .mount = nilfs_mount,
1255 1253 .kill_sb = kill_block_super,
1256 1254 .fs_flags = FS_REQUIRES_DEV,
1257 1255 };