diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-27 21:06:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-27 21:06:39 -0700 |
| commit | d96ff269a04be286989ead13bf8b4be55bdee8ee (patch) | |
| tree | 46b6d010a9a4dfe96dc86339d1cbded8874c6b8f /fs/afs/internal.h | |
| parent | 3a49584477ff4c8838833be9f3b7cc13f0f7c0d3 (diff) | |
| parent | 556e2f6020bf90f63c5dd65e9a2254be6db3185b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The new route handling in ip_mc_finish_output() from 'net' overlapped
with the new support for returning congestion notifications from BPF
programs.
In order to handle this I had to take the dev_loopback_xmit() calls
out of the switch statement.
The aquantia driver conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/afs/internal.h')
| -rw-r--r-- | fs/afs/internal.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/afs/internal.h b/fs/afs/internal.h index ce9559e98f17..0f84d0da5417 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h @@ -109,10 +109,8 @@ struct afs_call { struct rxrpc_call *rxcall; /* RxRPC call handle */ struct key *key; /* security for this call */ struct afs_net *net; /* The network namespace */ - union { - struct afs_server *server; - struct afs_vlserver *vlserver; - }; + struct afs_server *server; /* The fileserver record if fs op (pins ref) */ + struct afs_vlserver *vlserver; /* The vlserver record if vl op */ struct afs_cb_interest *cbi; /* Callback interest for server used */ struct afs_vnode *lvnode; /* vnode being locked */ void *request; /* request data (first part) */ @@ -616,7 +614,7 @@ struct afs_volume { unsigned int servers_seq; /* Incremented each time ->servers changes */ unsigned cb_v_break; /* Break-everything counter. */ - rwlock_t cb_break_lock; + rwlock_t cb_v_break_lock; afs_voltype_t type; /* type of volume */ short error; |