History

convert get_sb_single() users

Al Viro committed 16 years ago

Commit fc14f2f1 parent 848b83a25 files · +147 −139Browse files

Showing the changes to security (3 of 25 files). Show all

Unified · Split

3 files
  1. security/inode.c +4 −4
  2. security/selinux/selinuxfs.c +4 −5
  3. security/smack/smackfs.c +5 −7
security/inode.c+4−4
@@ -131,17 +131,17 @@ static int fill_super(struct super_block *sb, void *data, int silent) · 130 unmodified lines
131 return simple_fill_super(sb, SECURITYFS_MAGIC, files);131 return simple_fill_super(sb, SECURITYFS_MAGIC, files);
132}132}
133 133
134static int get_sb(struct file_system_type *fs_type,134static struct dentry *get_sb(struct file_system_type *fs_type,
135 int flags, const char *dev_name,135 int flags, const char *dev_name,
136 void *data, struct vfsmount *mnt)136 void *data)
137{137{
138 return get_sb_single(fs_type, flags, data, fill_super, mnt);138 return mount_single(fs_type, flags, data, fill_super);
139}139}
140 140
141static struct file_system_type fs_type = {141static struct file_system_type fs_type = {
142 .owner = THIS_MODULE,142 .owner = THIS_MODULE,
143 .name = "securityfs",143 .name = "securityfs",
144 .get_sb = get_sb,144 .mount = get_sb,
145 .kill_sb = kill_litter_super,145 .kill_sb = kill_litter_super,
146};146};
147 147
security/selinux/selinuxfs.c+4−5
@@ -1909,16 +1909,15 @@ err: · 1908 unmodified lines
1909 goto out;1909 goto out;
1910}1910}
1911 1911
1912static int sel_get_sb(struct file_system_type *fs_type,1912static struct dentry *sel_mount(struct file_system_type *fs_type,
1913 int flags, const char *dev_name, void *data,1913 int flags, const char *dev_name, void *data)
1914 struct vfsmount *mnt)
1915{1914{
1916 return get_sb_single(fs_type, flags, data, sel_fill_super, mnt);1915 return mount_single(fs_type, flags, data, sel_fill_super);
1917}1916}
1918 1917
1919static struct file_system_type sel_fs_type = {1918static struct file_system_type sel_fs_type = {
1920 .name = "selinuxfs",1919 .name = "selinuxfs",
1921 .get_sb = sel_get_sb,1920 .mount = sel_mount,
1922 .kill_sb = kill_litter_super,1921 .kill_sb = kill_litter_super,
1923};1922};
1924 1923
security/smack/smackfs.c+5−7
@@ -1310,27 +1310,25 @@ static int smk_fill_super(struct super_block *sb, void *data, int silent) · 1309 unmodified lines
1310}1310}
1311 1311
1312/**1312/**
1313 * smk_get_sb - get the smackfs superblock1313 * smk_mount - get the smackfs superblock
1314 * @fs_type: passed along without comment1314 * @fs_type: passed along without comment
1315 * @flags: passed along without comment1315 * @flags: passed along without comment
1316 * @dev_name: passed along without comment1316 * @dev_name: passed along without comment
1317 * @data: passed along without comment1317 * @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 */
1324static int smk_get_sb(struct file_system_type *fs_type,1323static 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
1331static struct file_system_type smk_fs_type = {1329static 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