16c00db4bb
Pull AFS fixes from David Howells:
"Here's a set of patches that fix a number of bugs in the in-kernel AFS
client, including:
- Fix directory locking to not use individual page locks for
directory reading/scanning but rather to use a semaphore on the
afs_vnode struct as the directory contents must be read in a single
blob and data from different reads must not be mixed as the entire
contents may be shuffled about between reads.
- Fix address list parsing to handle port specifiers correctly.
- Only give up callback records on a server if we actually talked to
that server (we might not be able to access a server).
- Fix some callback handling bugs, including refcounting,
whole-volume callbacks and when callbacks actually get broken in
response to a CB.CallBack op.
- Fix some server/address rotation bugs, including giving up if we
can't probe a server; giving up if a server says it doesn't have a
volume, but there are more servers to try.
- Fix the decoding of fetched statuses to be OpenAFS compatible.
- Fix the handling of server lookups in Cache Manager ops (such as
CB.InitCallBackState3) to use a UUID if possible and to handle no
server being found.
- Fix a bug in server lookup where not all addresses are compared.
- Fix the non-encryption of calls that prevents some servers from
being accessed (this also requires an AF_RXRPC patch that has
already gone in through the net tree).
There's also a patch that adds tracepoints to log Cache Manager ops
that don't find a matching server, either by UUID or by address"
* tag 'afs-fixes-20180514' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
afs: Fix the non-encryption of calls
afs: Fix CB.CallBack handling
afs: Fix whole-volume callback handling
afs: Fix afs_find_server search loop
afs: Fix the handling of an unfound server in CM operations
afs: Add a tracepoint to record callbacks from unlisted servers
afs: Fix the handling of CB.InitCallBackState3 to find the server by UUID
afs: Fix VNOVOL handling in address rotation
afs: Fix AFSFetchStatus decoder to provide OpenAFS compatibility
afs: Fix server rotation's handling of fileserver probe failure
afs: Fix refcounting in callback registration
afs: Fix giving up callbacks on server destruction
afs: Fix address list parsing
afs: Fix directory page locking
116 lines
3 KiB
C
116 lines
3 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include "cache.h"
|
|
#include "config.h"
|
|
#include <poll.h>
|
|
#include <stdio.h>
|
|
#include <subcmd/help.h>
|
|
#include "../builtin.h"
|
|
#include "levenshtein.h"
|
|
|
|
static int autocorrect;
|
|
|
|
static int perf_unknown_cmd_config(const char *var, const char *value,
|
|
void *cb __maybe_unused)
|
|
{
|
|
if (!strcmp(var, "help.autocorrect"))
|
|
return perf_config_int(&autocorrect, var,value);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int levenshtein_compare(const void *p1, const void *p2)
|
|
{
|
|
const struct cmdname *const *c1 = p1, *const *c2 = p2;
|
|
const char *s1 = (*c1)->name, *s2 = (*c2)->name;
|
|
int l1 = (*c1)->len;
|
|
int l2 = (*c2)->len;
|
|
return l1 != l2 ? l1 - l2 : strcmp(s1, s2);
|
|
}
|
|
|
|
static int add_cmd_list(struct cmdnames *cmds, struct cmdnames *old)
|
|
{
|
|
unsigned int i, nr = cmds->cnt + old->cnt;
|
|
void *tmp;
|
|
|
|
if (nr > cmds->alloc) {
|
|
/* Choose bigger one to alloc */
|
|
if (alloc_nr(cmds->alloc) < nr)
|
|
cmds->alloc = nr;
|
|
else
|
|
cmds->alloc = alloc_nr(cmds->alloc);
|
|
tmp = realloc(cmds->names, cmds->alloc * sizeof(*cmds->names));
|
|
if (!tmp)
|
|
return -1;
|
|
cmds->names = tmp;
|
|
}
|
|
for (i = 0; i < old->cnt; i++)
|
|
cmds->names[cmds->cnt++] = old->names[i];
|
|
zfree(&old->names);
|
|
old->cnt = 0;
|
|
return 0;
|
|
}
|
|
|
|
const char *help_unknown_cmd(const char *cmd)
|
|
{
|
|
unsigned int i, n = 0, best_similarity = 0;
|
|
struct cmdnames main_cmds, other_cmds;
|
|
|
|
memset(&main_cmds, 0, sizeof(main_cmds));
|
|
memset(&other_cmds, 0, sizeof(main_cmds));
|
|
|
|
perf_config(perf_unknown_cmd_config, NULL);
|
|
|
|
load_command_list("perf-", &main_cmds, &other_cmds);
|
|
|
|
if (add_cmd_list(&main_cmds, &other_cmds) < 0) {
|
|
fprintf(stderr, "ERROR: Failed to allocate command list for unknown command.\n");
|
|
goto end;
|
|
}
|
|
qsort(main_cmds.names, main_cmds.cnt,
|
|
sizeof(main_cmds.names), cmdname_compare);
|
|
uniq(&main_cmds);
|
|
|
|
if (main_cmds.cnt) {
|
|
/* This reuses cmdname->len for similarity index */
|
|
for (i = 0; i < main_cmds.cnt; ++i)
|
|
main_cmds.names[i]->len =
|
|
levenshtein(cmd, main_cmds.names[i]->name, 0, 2, 1, 4);
|
|
|
|
qsort(main_cmds.names, main_cmds.cnt,
|
|
sizeof(*main_cmds.names), levenshtein_compare);
|
|
|
|
best_similarity = main_cmds.names[0]->len;
|
|
n = 1;
|
|
while (n < main_cmds.cnt && best_similarity == main_cmds.names[n]->len)
|
|
++n;
|
|
}
|
|
|
|
if (autocorrect && n == 1) {
|
|
const char *assumed = main_cmds.names[0]->name;
|
|
|
|
main_cmds.names[0] = NULL;
|
|
clean_cmdnames(&main_cmds);
|
|
fprintf(stderr, "WARNING: You called a perf program named '%s', "
|
|
"which does not exist.\n"
|
|
"Continuing under the assumption that you meant '%s'\n",
|
|
cmd, assumed);
|
|
if (autocorrect > 0) {
|
|
fprintf(stderr, "in %0.1f seconds automatically...\n",
|
|
(float)autocorrect/10.0);
|
|
poll(NULL, 0, autocorrect * 100);
|
|
}
|
|
return assumed;
|
|
}
|
|
|
|
fprintf(stderr, "perf: '%s' is not a perf-command. See 'perf --help'.\n", cmd);
|
|
|
|
if (main_cmds.cnt && best_similarity < 6) {
|
|
fprintf(stderr, "\nDid you mean %s?\n",
|
|
n < 2 ? "this": "one of these");
|
|
|
|
for (i = 0; i < n; i++)
|
|
fprintf(stderr, "\t%s\n", main_cmds.names[i]->name);
|
|
}
|
|
end:
|
|
exit(1);
|
|
}
|