diff options
| author | David Howells | 2019-04-25 15:26:50 +0200 |
|---|---|---|
| committer | David Howells | 2019-04-25 15:26:50 +0200 |
| commit | 0b9bf3812ad1f0d937584e300826285694f53e2b (patch) | |
| tree | 9c92ffe7329d7a563c182b8c4b7beb776683888c /fs/afs/vl_probe.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-0b9bf3812ad1f0d937584e300826285694f53e2b.tar.gz kernel-qcow2-linux-0b9bf3812ad1f0d937584e300826285694f53e2b.tar.xz kernel-qcow2-linux-0b9bf3812ad1f0d937584e300826285694f53e2b.zip | |
afs: Split wait from afs_make_call()
Split the call to afs_wait_for_call_to_complete() from afs_make_call() to
make it easier to handle asynchronous calls and to make it easier to
convert a synchronous call to an asynchronous one in future, for instance
when someone tries to interrupt an operation by pressing Ctrl-C.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'fs/afs/vl_probe.c')
| -rw-r--r-- | fs/afs/vl_probe.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/fs/afs/vl_probe.c b/fs/afs/vl_probe.c index f402ee8171a1..b05e0de04f42 100644 --- a/fs/afs/vl_probe.c +++ b/fs/afs/vl_probe.c @@ -141,8 +141,8 @@ static bool afs_do_probe_vlserver(struct afs_net *net, struct afs_addr_cursor ac = { .index = 0, }; + struct afs_call *call; bool in_progress = false; - int err; _enter("%s", server->name); @@ -156,12 +156,14 @@ static bool afs_do_probe_vlserver(struct afs_net *net, server->probe.rtt = UINT_MAX; for (ac.index = 0; ac.index < ac.alist->nr_addrs; ac.index++) { - err = afs_vl_get_capabilities(net, &ac, key, server, - server_index, true); - if (err == -EINPROGRESS) + call = afs_vl_get_capabilities(net, &ac, key, server, + server_index); + if (!IS_ERR(call)) { + afs_put_call(call); in_progress = true; - else - afs_prioritise_error(_e, err, ac.abort_code); + } else { + afs_prioritise_error(_e, PTR_ERR(call), ac.abort_code); + } } if (!in_progress) |