diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2010-07-24 17:48:30 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-10-29 04:16:28 -0400 |
commit | fc14f2fef682df677d64a145256dbd263df2aa7b (patch) | |
tree | 74f6b939fbad959a43c04ec646cd0adc8af5f53a /security | |
parent | 848b83a59b772b8f102bc5e3f1187c2fa5676959 (diff) |
convert get_sb_single() users
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security')
-rw-r--r-- | security/inode.c | 8 | ||||
-rw-r--r-- | security/selinux/selinuxfs.c | 9 | ||||
-rw-r--r-- | security/smack/smackfs.c | 12 |
3 files changed, 13 insertions, 16 deletions
diff --git a/security/inode.c b/security/inode.c index cb8f47c66a58..c4df2fbebe6b 100644 --- a/security/inode.c +++ b/security/inode.c | |||
@@ -131,17 +131,17 @@ static int fill_super(struct super_block *sb, void *data, int silent) | |||
131 | return simple_fill_super(sb, SECURITYFS_MAGIC, files); | 131 | return simple_fill_super(sb, SECURITYFS_MAGIC, files); |
132 | } | 132 | } |
133 | 133 | ||
134 | static int get_sb(struct file_system_type *fs_type, | 134 | static 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 | ||
141 | static struct file_system_type fs_type = { | 141 | static 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 | ||
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index 55a755c1a1bd..073fd5b0a53a 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c | |||
@@ -1909,16 +1909,15 @@ err: | |||
1909 | goto out; | 1909 | goto out; |
1910 | } | 1910 | } |
1911 | 1911 | ||
1912 | static int sel_get_sb(struct file_system_type *fs_type, | 1912 | static 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 | ||
1919 | static struct file_system_type sel_fs_type = { | 1918 | static 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 | ||
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 | ||