diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2010-07-25 03:46:36 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-10-29 04:16:31 -0400 |
commit | 3c26ff6e499ee7e6f9f2bc7da5f2f30d80862ecf (patch) | |
tree | bd758d7f15f24aed225a64de77cc535785c50f96 /drivers/staging | |
parent | fc14f2fef682df677d64a145256dbd263df2aa7b (diff) |
convert get_sb_nodev() users
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/autofs/init.c | 8 | ||||
-rw-r--r-- | drivers/staging/pohmelfs/inode.c | 9 | ||||
-rw-r--r-- | drivers/staging/smbfs/inode.c | 8 |
3 files changed, 12 insertions, 13 deletions
diff --git a/drivers/staging/autofs/init.c b/drivers/staging/autofs/init.c index 765c72f4297..5e4b372ea66 100644 --- a/drivers/staging/autofs/init.c +++ b/drivers/staging/autofs/init.c | |||
@@ -14,16 +14,16 @@ | |||
14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
15 | #include "autofs_i.h" | 15 | #include "autofs_i.h" |
16 | 16 | ||
17 | static int autofs_get_sb(struct file_system_type *fs_type, | 17 | static struct dentry *autofs_mount(struct file_system_type *fs_type, |
18 | int flags, const char *dev_name, void *data, struct vfsmount *mnt) | 18 | int flags, const char *dev_name, void *data) |
19 | { | 19 | { |
20 | return get_sb_nodev(fs_type, flags, data, autofs_fill_super, mnt); | 20 | return mount_nodev(fs_type, flags, data, autofs_fill_super); |
21 | } | 21 | } |
22 | 22 | ||
23 | static struct file_system_type autofs_fs_type = { | 23 | static struct file_system_type autofs_fs_type = { |
24 | .owner = THIS_MODULE, | 24 | .owner = THIS_MODULE, |
25 | .name = "autofs", | 25 | .name = "autofs", |
26 | .get_sb = autofs_get_sb, | 26 | .mount = autofs_mount, |
27 | .kill_sb = autofs_kill_sb, | 27 | .kill_sb = autofs_kill_sb, |
28 | }; | 28 | }; |
29 | 29 | ||
diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c index c62d30017c0..61685ccceda 100644 --- a/drivers/staging/pohmelfs/inode.c +++ b/drivers/staging/pohmelfs/inode.c | |||
@@ -1937,11 +1937,10 @@ err_out_exit: | |||
1937 | /* | 1937 | /* |
1938 | * Some VFS magic here... | 1938 | * Some VFS magic here... |
1939 | */ | 1939 | */ |
1940 | static int pohmelfs_get_sb(struct file_system_type *fs_type, | 1940 | static struct dentry *pohmelfs_mount(struct file_system_type *fs_type, |
1941 | int flags, const char *dev_name, void *data, struct vfsmount *mnt) | 1941 | int flags, const char *dev_name, void *data) |
1942 | { | 1942 | { |
1943 | return get_sb_nodev(fs_type, flags, data, pohmelfs_fill_super, | 1943 | return mount_nodev(fs_type, flags, data, pohmelfs_fill_super); |
1944 | mnt); | ||
1945 | } | 1944 | } |
1946 | 1945 | ||
1947 | /* | 1946 | /* |
@@ -1958,7 +1957,7 @@ static void pohmelfs_kill_super(struct super_block *sb) | |||
1958 | static struct file_system_type pohmel_fs_type = { | 1957 | static struct file_system_type pohmel_fs_type = { |
1959 | .owner = THIS_MODULE, | 1958 | .owner = THIS_MODULE, |
1960 | .name = "pohmel", | 1959 | .name = "pohmel", |
1961 | .get_sb = pohmelfs_get_sb, | 1960 | .mount = pohmelfs_mount, |
1962 | .kill_sb = pohmelfs_kill_super, | 1961 | .kill_sb = pohmelfs_kill_super, |
1963 | }; | 1962 | }; |
1964 | 1963 | ||
diff --git a/drivers/staging/smbfs/inode.c b/drivers/staging/smbfs/inode.c index 552951aa749..f9c493591ce 100644 --- a/drivers/staging/smbfs/inode.c +++ b/drivers/staging/smbfs/inode.c | |||
@@ -793,16 +793,16 @@ out: | |||
793 | return error; | 793 | return error; |
794 | } | 794 | } |
795 | 795 | ||
796 | static int smb_get_sb(struct file_system_type *fs_type, | 796 | static struct dentry *smb_mount(struct file_system_type *fs_type, |
797 | int flags, const char *dev_name, void *data, struct vfsmount *mnt) | 797 | int flags, const char *dev_name, void *data) |
798 | { | 798 | { |
799 | return get_sb_nodev(fs_type, flags, data, smb_fill_super, mnt); | 799 | return mount_nodev(fs_type, flags, data, smb_fill_super); |
800 | } | 800 | } |
801 | 801 | ||
802 | static struct file_system_type smb_fs_type = { | 802 | static struct file_system_type smb_fs_type = { |
803 | .owner = THIS_MODULE, | 803 | .owner = THIS_MODULE, |
804 | .name = "smbfs", | 804 | .name = "smbfs", |
805 | .get_sb = smb_get_sb, | 805 | .mount = smb_mount, |
806 | .kill_sb = kill_anon_super, | 806 | .kill_sb = kill_anon_super, |
807 | .fs_flags = FS_BINARY_MOUNTDATA, | 807 | .fs_flags = FS_BINARY_MOUNTDATA, |
808 | }; | 808 | }; |