diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2007-07-01 12:13:27 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-07-10 23:40:46 -0400 |
| commit | 3ea97309e6b18bce200211b3f9188e8023321adc (patch) | |
| tree | a4a1f78dfd9b20df4df7dc08266b40f82205f16a /fs/nfs/nfsroot.c | |
| parent | 43780b87fa799ae65df11d89d4539d8d6a7c67eb (diff) | |
| download | linux-3ea97309e6b18bce200211b3f9188e8023321adc.tar.gz linux-3ea97309e6b18bce200211b3f9188e8023321adc.tar.bz2 linux-3ea97309e6b18bce200211b3f9188e8023321adc.zip | |
NFS: Remake nfsroot_mount as a permanent part of NFS client
In preparation for supporting NFSv2 and NFSv3 mount option handling in the
kernel NFS client, convert mount_clnt.c to be a permanent part of the NFS
client, instead of built only when CONFIG_ROOT_NFS is enabled.
In addition, we also replace the "struct sockaddr_in *" argument with
something more generic, to help support IPv6 at some later point.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfsroot.c')
| -rw-r--r-- | fs/nfs/nfsroot.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c index f0db4703b1c9..3490322d1145 100644 --- a/fs/nfs/nfsroot.c +++ b/fs/nfs/nfsroot.c @@ -496,7 +496,8 @@ static int __init root_nfs_get_handle(void) NFS_MNT3_VERSION : NFS_MNT_VERSION; set_sockaddr(&sin, servaddr, htons(mount_port)); - status = nfsroot_mount(&sin, nfs_path, &fh, version, protocol); + status = nfs_mount((struct sockaddr *) &sin, sizeof(sin), NULL, + nfs_path, version, protocol, &fh); if (status < 0) printk(KERN_ERR "Root-NFS: Server returned error %d " "while mounting %s\n", status, nfs_path); |