diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-21 23:01:54 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-21 23:01:54 +0300 |
| commit | 6f6e434aa267a6030477876d89444fe3a6b7a48d (patch) | |
| tree | 67755c422f1e85451aa646eae21d4c6f3f389d9f /fs/afs/write.c | |
| parent | 44c752fe584d8b9f6e0756ecffa8691677471862 (diff) | |
| parent | 6741c4bb389da103c0d79ad1961884628900bfe6 (diff) | |
| download | linux-6f6e434aa267a6030477876d89444fe3a6b7a48d.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
S390 bpf_jit.S is removed in net-next and had changes in 'net',
since that code isn't used any more take the removal.
TLS data structures split the TX and RX components in 'net-next',
put the new struct members from the bug fix in 'net' into the RX
part.
The 'net-next' tree had some reworking of how the ERSPAN code works in
the GRE tunneling code, overlapping with a one-line headroom
calculation fix in 'net'.
Overlapping changes in __sock_map_ctx_update_elem(), keep the bits
that read the prog members via READ_ONCE() into local variables
before using them.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/afs/write.c')
| -rw-r--r-- | fs/afs/write.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/afs/write.c b/fs/afs/write.c index c164698dc304..8b39e6ebb40b 100644 --- a/fs/afs/write.c +++ b/fs/afs/write.c @@ -351,7 +351,7 @@ found_key: ret = -ERESTARTSYS; if (afs_begin_vnode_operation(&fc, vnode, wbk->key)) { while (afs_select_fileserver(&fc)) { - fc.cb_break = vnode->cb_break + vnode->cb_s_break; + fc.cb_break = afs_calc_vnode_cb_break(vnode); afs_fs_store_data(&fc, mapping, first, last, offset, to); } |