sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

nfs: simplify rpc_lookup_req 

Instead of letting rpc_lookup_req set mount_port and nfs_port, let it
return the port found and let the caller use that information.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Uwe Kleine-König 2014-02-07 22:28:07 +01:00 committed by Sascha Hauer
parent 2897531de6
commit 0f2c0a7edd
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fs/nfs.c
View File

@ -374,22 +374,8 @@ static int rpc_lookup_req(struct nfs_priv *npriv, int prog, int ver)
if (ret)
return ret;
port = net_read_uint32((uint32_t *)(nfs_packet + sizeof(struct rpc_reply)));
switch (prog) {
case PROG_MOUNT:
npriv->mount_port = ntohl(port);
debug("mount port: %d\n", npriv->mount_port);
break;
case PROG_NFS:
npriv->nfs_port = ntohl(port);
debug("nfs port: %d\n", npriv->nfs_port);
break;
default:
return -EINVAL;
}
return 0;
port = ntohl(net_read_uint32(nfs_packet + sizeof(struct rpc_reply)));
return port;
}
/*
@ -1000,16 +986,18 @@ static int nfs_probe(struct device_d *dev)
net_udp_bind(npriv->con, 1000);
ret = rpc_lookup_req(npriv, PROG_MOUNT, 2);
if (ret) {
if (ret < 0) {
printf("lookup mount port failed with %d\n", ret);
goto err2;
}
npriv->mount_port = ret;
ret = rpc_lookup_req(npriv, PROG_NFS, 2);
if (ret) {
if (ret < 0) {
printf("lookup nfs port failed with %d\n", ret);
goto err2;
}
npriv->nfs_port = ret;
ret = nfs_mount_req(npriv);
if (ret) {