diff options
| author | Al Viro <[email protected]> | 2018-06-02 22:08:11 +0000 |
|---|---|---|
| committer | Al Viro <[email protected]> | 2018-06-02 22:09:27 +0000 |
| commit | de52cf922a4a17d0a4cd34d697db62a01c1bd092 (patch) | |
| tree | 1c12675d523eaa34e01499ae2a70dc6983a1918b /fs/afs/file.c | |
| parent | afs: Implement network namespacing (diff) | |
| parent | afs: Fix the non-encryption of calls (diff) | |
| download | kernel-de52cf922a4a17d0a4cd34d697db62a01c1bd092.tar.gz kernel-de52cf922a4a17d0a4cd34d697db62a01c1bd092.zip | |
Merge tag 'afs-fixes-20180514' into afs-proc
backmerge AFS fixes that went into mainline and deal with
the conflict in fs/afs/fsclient.c
Signed-off-by: Al Viro <[email protected]>
Diffstat (limited to 'fs/afs/file.c')
| -rw-r--r-- | fs/afs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/afs/file.c b/fs/afs/file.c index c24c08016dd9..7d4f26198573 100644 --- a/fs/afs/file.c +++ b/fs/afs/file.c @@ -238,7 +238,7 @@ int afs_fetch_data(struct afs_vnode *vnode, struct key *key, struct afs_read *de ret = -ERESTARTSYS; if (afs_begin_vnode_operation(&fc, vnode, 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_fetch_data(&fc, desc); } |