diff options
Diffstat (limited to 'drivers/usb/gadget/f_fs.c')
-rw-r--r-- | drivers/usb/gadget/f_fs.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c index f276e9594f00..4a830df4fc31 100644 --- a/drivers/usb/gadget/f_fs.c +++ b/drivers/usb/gadget/f_fs.c | |||
@@ -1176,9 +1176,9 @@ invalid: | |||
1176 | 1176 | ||
1177 | /* "mount -t functionfs dev_name /dev/function" ends up here */ | 1177 | /* "mount -t functionfs dev_name /dev/function" ends up here */ |
1178 | 1178 | ||
1179 | static int | 1179 | static struct dentry * |
1180 | ffs_fs_get_sb(struct file_system_type *t, int flags, | 1180 | ffs_fs_mount(struct file_system_type *t, int flags, |
1181 | const char *dev_name, void *opts, struct vfsmount *mnt) | 1181 | const char *dev_name, void *opts) |
1182 | { | 1182 | { |
1183 | struct ffs_sb_fill_data data = { | 1183 | struct ffs_sb_fill_data data = { |
1184 | .perms = { | 1184 | .perms = { |
@@ -1194,14 +1194,14 @@ ffs_fs_get_sb(struct file_system_type *t, int flags, | |||
1194 | 1194 | ||
1195 | ret = functionfs_check_dev_callback(dev_name); | 1195 | ret = functionfs_check_dev_callback(dev_name); |
1196 | if (unlikely(ret < 0)) | 1196 | if (unlikely(ret < 0)) |
1197 | return ret; | 1197 | return ERR_PTR(ret); |
1198 | 1198 | ||
1199 | ret = ffs_fs_parse_opts(&data, opts); | 1199 | ret = ffs_fs_parse_opts(&data, opts); |
1200 | if (unlikely(ret < 0)) | 1200 | if (unlikely(ret < 0)) |
1201 | return ret; | 1201 | return ERR_PTR(ret); |
1202 | 1202 | ||
1203 | data.dev_name = dev_name; | 1203 | data.dev_name = dev_name; |
1204 | return get_sb_single(t, flags, &data, ffs_sb_fill, mnt); | 1204 | return mount_single(t, flags, &data, ffs_sb_fill); |
1205 | } | 1205 | } |
1206 | 1206 | ||
1207 | static void | 1207 | static void |
@@ -1220,7 +1220,7 @@ ffs_fs_kill_sb(struct super_block *sb) | |||
1220 | static struct file_system_type ffs_fs_type = { | 1220 | static struct file_system_type ffs_fs_type = { |
1221 | .owner = THIS_MODULE, | 1221 | .owner = THIS_MODULE, |
1222 | .name = "functionfs", | 1222 | .name = "functionfs", |
1223 | .get_sb = ffs_fs_get_sb, | 1223 | .mount = ffs_fs_mount, |
1224 | .kill_sb = ffs_fs_kill_sb, | 1224 | .kill_sb = ffs_fs_kill_sb, |
1225 | }; | 1225 | }; |
1226 | 1226 | ||