aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-06-24 08:41:41 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-06-24 13:07:53 -0400
commit816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch)
tree421fa29aedff988e392f92780637553e275d37a0 /net/sunrpc
parent70ac4385a13f78bc478f26d317511893741b05bd (diff)
parentd384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff)
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts: fs/nfs/inode.c fs/super.c Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch 'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'net/sunrpc')
-rw-r--r--net/sunrpc/rpc_pipe.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index a5226df8ac03..dafe793c774e 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
818static struct super_block * 818static int
819rpc_get_sb(struct file_system_type *fs_type, 819rpc_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
825static struct file_system_type rpc_pipe_fs_type = { 825static struct file_system_type rpc_pipe_fs_type = {