repositories
/
deb_libnfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #44 from plieven/master
[deb_libnfs.git]
/
lib
/
libnfs.c
diff --git
a/lib/libnfs.c
b/lib/libnfs.c
index 4eb18512900c420aaeb279c9f2e24317e8977074..029c9c94d1f82795a5104e456caec30fdbbc4e3e 100644
(file)
--- a/
lib/libnfs.c
+++ b/
lib/libnfs.c
@@
-173,14
+173,14
@@
char *nfs_get_error(struct nfs_context *nfs)
return rpc_get_error(nfs->rpc);
};
return rpc_get_error(nfs->rpc);
};
-
int rpc_set_context_args(struct rpc_context *rpc
, char *arg, char *val)
+
static int nfs_set_context_args(struct nfs_context *nfs
, char *arg, char *val)
{
if (!strncmp(arg, "tcp-syncnt", 10)) {
{
if (!strncmp(arg, "tcp-syncnt", 10)) {
- rpc_set_tcp_syncnt(
rpc
, atoi(val));
+ rpc_set_tcp_syncnt(
nfs_get_rpc_context(nfs)
, atoi(val));
} else if (!strncmp(arg, "uid", 3)) {
} else if (!strncmp(arg, "uid", 3)) {
- rpc_set_uid(
rpc
, atoi(val));
+ rpc_set_uid(
nfs_get_rpc_context(nfs)
, atoi(val));
} else if (!strncmp(arg, "gid", 3)) {
} else if (!strncmp(arg, "gid", 3)) {
- rpc_set_gid(
rpc
, atoi(val));
+ rpc_set_gid(
nfs_get_rpc_context(nfs)
, atoi(val));
}
return 0;
}
}
return 0;
}
@@
-288,8
+288,7
@@
flags:
if (strp2) {
*strp2 = 0;
strp2++;
if (strp2) {
*strp2 = 0;
strp2++;
- rpc_set_context_args(nfs_get_rpc_context(nfs),
- strp, strp2);
+ nfs_set_context_args(nfs, strp, strp2);
}
}
}
}
@@
-654,7
+653,7
@@
static void nfs_mount_7_cb(struct rpc_context *rpc, int status, void *command_da
return;
}
return;
}
- if (rpc_nfs_null_async(rpc, nfs_mount_8_cb, data) != 0) {
+ if (rpc_nfs
3
_null_async(rpc, nfs_mount_8_cb, data) != 0) {
data->cb(-ENOMEM, nfs, command_data, data->private_data);
free_nfs_cb_data(data);
return;
data->cb(-ENOMEM, nfs, command_data, data->private_data);
free_nfs_cb_data(data);
return;
@@
-728,7
+727,7
@@
static void nfs_mount_5_cb(struct rpc_context *rpc, int status, void *command_da
return;
}
return;
}
- if (rpc_mount_mnt_async(rpc, nfs_mount_6_cb, nfs->export, data) != 0) {
+ if (rpc_mount
3
_mnt_async(rpc, nfs_mount_6_cb, nfs->export, data) != 0) {
data->cb(-ENOMEM, nfs, command_data, data->private_data);
free_nfs_cb_data(data);
return;
data->cb(-ENOMEM, nfs, command_data, data->private_data);
free_nfs_cb_data(data);
return;
@@
-756,7
+755,7
@@
static void nfs_mount_4_cb(struct rpc_context *rpc, int status, void *command_da
return;
}
return;
}
- if (rpc_mount_null_async(rpc, nfs_mount_5_cb, data) != 0) {
+ if (rpc_mount
3
_null_async(rpc, nfs_mount_5_cb, data) != 0) {
data->cb(-ENOMEM, nfs, command_data, data->private_data);
free_nfs_cb_data(data);
return;
data->cb(-ENOMEM, nfs, command_data, data->private_data);
free_nfs_cb_data(data);
return;
@@
-3918,7
+3917,7
@@
static void mount_export_4_cb(struct rpc_context *rpc, int status, void *command
return;
}
return;
}
- if (rpc_mount_export_async(rpc, mount_export_5_cb, data) != 0) {
+ if (rpc_mount
3
_export_async(rpc, mount_export_5_cb, data) != 0) {
data->cb(rpc, -ENOMEM, command_data, data->private_data);
free_mount_cb_data(data);
return;
data->cb(rpc, -ENOMEM, command_data, data->private_data);
free_mount_cb_data(data);
return;