diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/socket.c | 7 | ||||
-rw-r--r-- | net/sunrpc/rpc_pipe.c | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/net/socket.c b/net/socket.c index 02948b622bd2..565f5e8d1191 100644 --- a/net/socket.c +++ b/net/socket.c | |||
@@ -335,10 +335,11 @@ static struct super_operations sockfs_ops = { | |||
335 | .statfs = simple_statfs, | 335 | .statfs = simple_statfs, |
336 | }; | 336 | }; |
337 | 337 | ||
338 | static struct super_block *sockfs_get_sb(struct file_system_type *fs_type, | 338 | static int sockfs_get_sb(struct file_system_type *fs_type, |
339 | int flags, const char *dev_name, void *data) | 339 | int flags, const char *dev_name, void *data, struct vfsmount *mnt) |
340 | { | 340 | { |
341 | return get_sb_pseudo(fs_type, "socket:", &sockfs_ops, SOCKFS_MAGIC); | 341 | return get_sb_pseudo(fs_type, "socket:", &sockfs_ops, SOCKFS_MAGIC, |
342 | mnt); | ||
342 | } | 343 | } |
343 | 344 | ||
344 | static struct vfsmount *sock_mnt __read_mostly; | 345 | static struct vfsmount *sock_mnt __read_mostly; |
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index cc673dd8433f..8241fa726803 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c | |||
@@ -815,11 +815,11 @@ out: | |||
815 | return -ENOMEM; | 815 | return -ENOMEM; |
816 | } | 816 | } |
817 | 817 | ||
818 | static struct super_block * | 818 | static int |
819 | rpc_get_sb(struct file_system_type *fs_type, | 819 | rpc_get_sb(struct file_system_type *fs_type, |
820 | int flags, const char *dev_name, void *data) | 820 | int flags, const char *dev_name, void *data, struct vfsmount *mnt) |
821 | { | 821 | { |
822 | return get_sb_single(fs_type, flags, data, rpc_fill_super); | 822 | return get_sb_single(fs_type, flags, data, rpc_fill_super, mnt); |
823 | } | 823 | } |
824 | 824 | ||
825 | static struct file_system_type rpc_pipe_fs_type = { | 825 | static struct file_system_type rpc_pipe_fs_type = { |