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
209 lines
4.2 KiB
C
209 lines
4.2 KiB
C
/*
|
|
* (c) 2009 Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
*
|
|
* Licensed under the GPLv2.
|
|
*/
|
|
|
|
#include "strlist.h"
|
|
#include "util.h"
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
static
|
|
struct rb_node *strlist__node_new(struct rblist *rblist, const void *entry)
|
|
{
|
|
const char *s = entry;
|
|
struct rb_node *rc = NULL;
|
|
struct strlist *strlist = container_of(rblist, struct strlist, rblist);
|
|
struct str_node *snode = malloc(sizeof(*snode));
|
|
|
|
if (snode != NULL) {
|
|
if (strlist->dupstr) {
|
|
s = strdup(s);
|
|
if (s == NULL)
|
|
goto out_delete;
|
|
}
|
|
snode->s = s;
|
|
rc = &snode->rb_node;
|
|
}
|
|
|
|
return rc;
|
|
|
|
out_delete:
|
|
free(snode);
|
|
return NULL;
|
|
}
|
|
|
|
static void str_node__delete(struct str_node *snode, bool dupstr)
|
|
{
|
|
if (dupstr)
|
|
zfree((char **)&snode->s);
|
|
free(snode);
|
|
}
|
|
|
|
static
|
|
void strlist__node_delete(struct rblist *rblist, struct rb_node *rb_node)
|
|
{
|
|
struct strlist *slist = container_of(rblist, struct strlist, rblist);
|
|
struct str_node *snode = container_of(rb_node, struct str_node, rb_node);
|
|
|
|
str_node__delete(snode, slist->dupstr);
|
|
}
|
|
|
|
static int strlist__node_cmp(struct rb_node *rb_node, const void *entry)
|
|
{
|
|
const char *str = entry;
|
|
struct str_node *snode = container_of(rb_node, struct str_node, rb_node);
|
|
|
|
return strcmp(snode->s, str);
|
|
}
|
|
|
|
int strlist__add(struct strlist *slist, const char *new_entry)
|
|
{
|
|
return rblist__add_node(&slist->rblist, new_entry);
|
|
}
|
|
|
|
int strlist__load(struct strlist *slist, const char *filename)
|
|
{
|
|
char entry[1024];
|
|
int err;
|
|
FILE *fp = fopen(filename, "r");
|
|
|
|
if (fp == NULL)
|
|
return -errno;
|
|
|
|
while (fgets(entry, sizeof(entry), fp) != NULL) {
|
|
const size_t len = strlen(entry);
|
|
|
|
if (len == 0)
|
|
continue;
|
|
entry[len - 1] = '\0';
|
|
|
|
err = strlist__add(slist, entry);
|
|
if (err != 0)
|
|
goto out;
|
|
}
|
|
|
|
err = 0;
|
|
out:
|
|
fclose(fp);
|
|
return err;
|
|
}
|
|
|
|
void strlist__remove(struct strlist *slist, struct str_node *snode)
|
|
{
|
|
rblist__remove_node(&slist->rblist, &snode->rb_node);
|
|
}
|
|
|
|
struct str_node *strlist__find(struct strlist *slist, const char *entry)
|
|
{
|
|
struct str_node *snode = NULL;
|
|
struct rb_node *rb_node = rblist__find(&slist->rblist, entry);
|
|
|
|
if (rb_node)
|
|
snode = container_of(rb_node, struct str_node, rb_node);
|
|
|
|
return snode;
|
|
}
|
|
|
|
static int strlist__parse_list_entry(struct strlist *slist, const char *s,
|
|
const char *subst_dir)
|
|
{
|
|
int err;
|
|
char *subst = NULL;
|
|
|
|
if (strncmp(s, "file://", 7) == 0)
|
|
return strlist__load(slist, s + 7);
|
|
|
|
if (subst_dir) {
|
|
err = -ENOMEM;
|
|
if (asprintf(&subst, "%s/%s", subst_dir, s) < 0)
|
|
goto out;
|
|
|
|
if (access(subst, F_OK) == 0) {
|
|
err = strlist__load(slist, subst);
|
|
goto out;
|
|
}
|
|
|
|
if (slist->file_only) {
|
|
err = -ENOENT;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
err = strlist__add(slist, s);
|
|
out:
|
|
free(subst);
|
|
return err;
|
|
}
|
|
|
|
static int strlist__parse_list(struct strlist *slist, const char *s, const char *subst_dir)
|
|
{
|
|
char *sep;
|
|
int err;
|
|
|
|
while ((sep = strchr(s, ',')) != NULL) {
|
|
*sep = '\0';
|
|
err = strlist__parse_list_entry(slist, s, subst_dir);
|
|
*sep = ',';
|
|
if (err != 0)
|
|
return err;
|
|
s = sep + 1;
|
|
}
|
|
|
|
return *s ? strlist__parse_list_entry(slist, s, subst_dir) : 0;
|
|
}
|
|
|
|
struct strlist *strlist__new(const char *list, const struct strlist_config *config)
|
|
{
|
|
struct strlist *slist = malloc(sizeof(*slist));
|
|
|
|
if (slist != NULL) {
|
|
bool dupstr = true;
|
|
bool file_only = false;
|
|
const char *dirname = NULL;
|
|
|
|
if (config) {
|
|
dupstr = !config->dont_dupstr;
|
|
dirname = config->dirname;
|
|
file_only = config->file_only;
|
|
}
|
|
|
|
rblist__init(&slist->rblist);
|
|
slist->rblist.node_cmp = strlist__node_cmp;
|
|
slist->rblist.node_new = strlist__node_new;
|
|
slist->rblist.node_delete = strlist__node_delete;
|
|
|
|
slist->dupstr = dupstr;
|
|
slist->file_only = file_only;
|
|
|
|
if (list && strlist__parse_list(slist, list, dirname) != 0)
|
|
goto out_error;
|
|
}
|
|
|
|
return slist;
|
|
out_error:
|
|
free(slist);
|
|
return NULL;
|
|
}
|
|
|
|
void strlist__delete(struct strlist *slist)
|
|
{
|
|
if (slist != NULL)
|
|
rblist__delete(&slist->rblist);
|
|
}
|
|
|
|
struct str_node *strlist__entry(const struct strlist *slist, unsigned int idx)
|
|
{
|
|
struct str_node *snode = NULL;
|
|
struct rb_node *rb_node;
|
|
|
|
rb_node = rblist__entry(&slist->rblist, idx);
|
|
if (rb_node)
|
|
snode = container_of(rb_node, struct str_node, rb_node);
|
|
|
|
return snode;
|
|
}
|