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
68 lines
1.6 KiB
C
68 lines
1.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __JSMN_H_
|
|
#define __JSMN_H_
|
|
|
|
/*
|
|
* JSON type identifier. Basic types are:
|
|
* o Object
|
|
* o Array
|
|
* o String
|
|
* o Other primitive: number, boolean (true/false) or null
|
|
*/
|
|
typedef enum {
|
|
JSMN_PRIMITIVE = 0,
|
|
JSMN_OBJECT = 1,
|
|
JSMN_ARRAY = 2,
|
|
JSMN_STRING = 3
|
|
} jsmntype_t;
|
|
|
|
typedef enum {
|
|
/* Not enough tokens were provided */
|
|
JSMN_ERROR_NOMEM = -1,
|
|
/* Invalid character inside JSON string */
|
|
JSMN_ERROR_INVAL = -2,
|
|
/* The string is not a full JSON packet, more bytes expected */
|
|
JSMN_ERROR_PART = -3,
|
|
/* Everything was fine */
|
|
JSMN_SUCCESS = 0
|
|
} jsmnerr_t;
|
|
|
|
/*
|
|
* JSON token description.
|
|
* @param type type (object, array, string etc.)
|
|
* @param start start position in JSON data string
|
|
* @param end end position in JSON data string
|
|
*/
|
|
typedef struct {
|
|
jsmntype_t type;
|
|
int start;
|
|
int end;
|
|
int size;
|
|
} jsmntok_t;
|
|
|
|
/*
|
|
* JSON parser. Contains an array of token blocks available. Also stores
|
|
* the string being parsed now and current position in that string
|
|
*/
|
|
typedef struct {
|
|
unsigned int pos; /* offset in the JSON string */
|
|
int toknext; /* next token to allocate */
|
|
int toksuper; /* superior token node, e.g parent object or array */
|
|
} jsmn_parser;
|
|
|
|
/*
|
|
* Create JSON parser over an array of tokens
|
|
*/
|
|
void jsmn_init(jsmn_parser *parser);
|
|
|
|
/*
|
|
* Run JSON parser. It parses a JSON data string into and array of tokens,
|
|
* each describing a single JSON object.
|
|
*/
|
|
jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js,
|
|
size_t len,
|
|
jsmntok_t *tokens, unsigned int num_tokens);
|
|
|
|
const char *jsmn_strerror(jsmnerr_t err);
|
|
|
|
#endif /* __JSMN_H_ */
|