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
115 lines
2.4 KiB
C
115 lines
2.4 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include "../util.h"
|
|
#include "../../util/util.h"
|
|
#include "../../util/debug.h"
|
|
#include "gtk.h"
|
|
|
|
#include <string.h>
|
|
|
|
|
|
struct perf_gtk_context *pgctx;
|
|
|
|
struct perf_gtk_context *perf_gtk__activate_context(GtkWidget *window)
|
|
{
|
|
struct perf_gtk_context *ctx;
|
|
|
|
ctx = malloc(sizeof(*pgctx));
|
|
if (ctx)
|
|
ctx->main_window = window;
|
|
|
|
return ctx;
|
|
}
|
|
|
|
int perf_gtk__deactivate_context(struct perf_gtk_context **ctx)
|
|
{
|
|
if (!perf_gtk__is_active_context(*ctx))
|
|
return -1;
|
|
|
|
zfree(ctx);
|
|
return 0;
|
|
}
|
|
|
|
static int perf_gtk__error(const char *format, va_list args)
|
|
{
|
|
char *msg;
|
|
GtkWidget *dialog;
|
|
|
|
if (!perf_gtk__is_active_context(pgctx) ||
|
|
vasprintf(&msg, format, args) < 0) {
|
|
fprintf(stderr, "Error:\n");
|
|
vfprintf(stderr, format, args);
|
|
fprintf(stderr, "\n");
|
|
return -1;
|
|
}
|
|
|
|
dialog = gtk_message_dialog_new_with_markup(GTK_WINDOW(pgctx->main_window),
|
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
|
GTK_MESSAGE_ERROR,
|
|
GTK_BUTTONS_CLOSE,
|
|
"<b>Error</b>\n\n%s", msg);
|
|
gtk_dialog_run(GTK_DIALOG(dialog));
|
|
|
|
gtk_widget_destroy(dialog);
|
|
free(msg);
|
|
return 0;
|
|
}
|
|
|
|
#ifdef HAVE_GTK_INFO_BAR_SUPPORT
|
|
static int perf_gtk__warning_info_bar(const char *format, va_list args)
|
|
{
|
|
char *msg;
|
|
|
|
if (!perf_gtk__is_active_context(pgctx) ||
|
|
vasprintf(&msg, format, args) < 0) {
|
|
fprintf(stderr, "Warning:\n");
|
|
vfprintf(stderr, format, args);
|
|
fprintf(stderr, "\n");
|
|
return -1;
|
|
}
|
|
|
|
gtk_label_set_text(GTK_LABEL(pgctx->message_label), msg);
|
|
gtk_info_bar_set_message_type(GTK_INFO_BAR(pgctx->info_bar),
|
|
GTK_MESSAGE_WARNING);
|
|
gtk_widget_show(pgctx->info_bar);
|
|
|
|
free(msg);
|
|
return 0;
|
|
}
|
|
#else
|
|
static int perf_gtk__warning_statusbar(const char *format, va_list args)
|
|
{
|
|
char *msg, *p;
|
|
|
|
if (!perf_gtk__is_active_context(pgctx) ||
|
|
vasprintf(&msg, format, args) < 0) {
|
|
fprintf(stderr, "Warning:\n");
|
|
vfprintf(stderr, format, args);
|
|
fprintf(stderr, "\n");
|
|
return -1;
|
|
}
|
|
|
|
gtk_statusbar_pop(GTK_STATUSBAR(pgctx->statbar),
|
|
pgctx->statbar_ctx_id);
|
|
|
|
/* Only first line can be displayed */
|
|
p = strchr(msg, '\n');
|
|
if (p)
|
|
*p = '\0';
|
|
|
|
gtk_statusbar_push(GTK_STATUSBAR(pgctx->statbar),
|
|
pgctx->statbar_ctx_id, msg);
|
|
|
|
free(msg);
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
struct perf_error_ops perf_gtk_eops = {
|
|
.error = perf_gtk__error,
|
|
#ifdef HAVE_GTK_INFO_BAR_SUPPORT
|
|
.warning = perf_gtk__warning_info_bar,
|
|
#else
|
|
.warning = perf_gtk__warning_statusbar,
|
|
#endif
|
|
};
|