![Linus Torvalds](/assets/img/avatar_default.png)
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
62 lines
1.2 KiB
C
62 lines
1.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
|
|
#ifndef SOCK_DCCP
|
|
# define SOCK_DCCP 6
|
|
#endif
|
|
|
|
#ifndef SOCK_CLOEXEC
|
|
# define SOCK_CLOEXEC 02000000
|
|
#endif
|
|
|
|
#ifndef SOCK_NONBLOCK
|
|
# define SOCK_NONBLOCK 00004000
|
|
#endif
|
|
|
|
#ifndef SOCK_TYPE_MASK
|
|
#define SOCK_TYPE_MASK 0xf
|
|
#endif
|
|
|
|
static size_t syscall_arg__scnprintf_socket_type(char *bf, size_t size, struct syscall_arg *arg)
|
|
{
|
|
size_t printed;
|
|
int type = arg->val,
|
|
flags = type & ~SOCK_TYPE_MASK;
|
|
|
|
type &= SOCK_TYPE_MASK;
|
|
/*
|
|
* Can't use a strarray, MIPS may override for ABI reasons.
|
|
*/
|
|
switch (type) {
|
|
#define P_SK_TYPE(n) case SOCK_##n: printed = scnprintf(bf, size, #n); break;
|
|
P_SK_TYPE(STREAM);
|
|
P_SK_TYPE(DGRAM);
|
|
P_SK_TYPE(RAW);
|
|
P_SK_TYPE(RDM);
|
|
P_SK_TYPE(SEQPACKET);
|
|
P_SK_TYPE(DCCP);
|
|
P_SK_TYPE(PACKET);
|
|
#undef P_SK_TYPE
|
|
default:
|
|
printed = scnprintf(bf, size, "%#x", type);
|
|
}
|
|
|
|
#define P_SK_FLAG(n) \
|
|
if (flags & SOCK_##n) { \
|
|
printed += scnprintf(bf + printed, size - printed, "|%s", #n); \
|
|
flags &= ~SOCK_##n; \
|
|
}
|
|
|
|
P_SK_FLAG(CLOEXEC);
|
|
P_SK_FLAG(NONBLOCK);
|
|
#undef P_SK_FLAG
|
|
|
|
if (flags)
|
|
printed += scnprintf(bf + printed, size - printed, "|%#x", flags);
|
|
|
|
return printed;
|
|
}
|
|
|
|
#define SCA_SK_TYPE syscall_arg__scnprintf_socket_type
|