diff options
Diffstat (limited to 'security/smack/smackfs.c')
-rw-r--r-- | security/smack/smackfs.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c index 7512502d0162..dc1fd6239f24 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c | |||
@@ -1310,27 +1310,25 @@ static int smk_fill_super(struct super_block *sb, void *data, int silent) | |||
1310 | } | 1310 | } |
1311 | 1311 | ||
1312 | /** | 1312 | /** |
1313 | * smk_get_sb - get the smackfs superblock | 1313 | * smk_mount - get the smackfs superblock |
1314 | * @fs_type: passed along without comment | 1314 | * @fs_type: passed along without comment |
1315 | * @flags: passed along without comment | 1315 | * @flags: passed along without comment |
1316 | * @dev_name: passed along without comment | 1316 | * @dev_name: passed along without comment |
1317 | * @data: passed along without comment | 1317 | * @data: passed along without comment |
1318 | * @mnt: passed along without comment | ||
1319 | * | 1318 | * |
1320 | * Just passes everything along. | 1319 | * Just passes everything along. |
1321 | * | 1320 | * |
1322 | * Returns what the lower level code does. | 1321 | * Returns what the lower level code does. |
1323 | */ | 1322 | */ |
1324 | static int smk_get_sb(struct file_system_type *fs_type, | 1323 | static struct dentry *smk_mount(struct file_system_type *fs_type, |
1325 | int flags, const char *dev_name, void *data, | 1324 | int flags, const char *dev_name, void *data) |
1326 | struct vfsmount *mnt) | ||
1327 | { | 1325 | { |
1328 | return get_sb_single(fs_type, flags, data, smk_fill_super, mnt); | 1326 | return mount_single(fs_type, flags, data, smk_fill_super); |
1329 | } | 1327 | } |
1330 | 1328 | ||
1331 | static struct file_system_type smk_fs_type = { | 1329 | static struct file_system_type smk_fs_type = { |
1332 | .name = "smackfs", | 1330 | .name = "smackfs", |
1333 | .get_sb = smk_get_sb, | 1331 | .mount = smk_mount, |
1334 | .kill_sb = kill_litter_super, | 1332 | .kill_sb = kill_litter_super, |
1335 | }; | 1333 | }; |
1336 | 1334 | ||