summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-09-25 20:46:11 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-09-25 20:46:11 +0300
commit6d28cf7dfede6cfca5119a0d415a6a447c68f3a0 (patch)
tree502b4318613e18453544e18cb0e52a171968a179 /net
parent15083aa02561f6f208a253132c9d3b72af8c2b40 (diff)
parent13a9a9d74d4d9689ad65938966dbc66386063648 (diff)
downloadlinux-6d28cf7dfede6cfca5119a0d415a6a447c68f3a0.tar.xz
Merge tag 'nfsd-5.9-2' of git://git.linux-nfs.org/projects/cel/cel-2.6
Pull NFS server fix from Chuck Lever: "Fix incorrect calculation on platforms that implement flush_dcache_page()" * tag 'nfsd-5.9-2' of git://git.linux-nfs.org/projects/cel/cel-2.6: SUNRPC: Fix svc_flush_dcache()
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/svcsock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index d5805fa1d066..c2752e2b9ce3 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -228,7 +228,7 @@ static int svc_one_sock_name(struct svc_sock *svsk, char *buf, int remaining)
static void svc_flush_bvec(const struct bio_vec *bvec, size_t size, size_t seek)
{
struct bvec_iter bi = {
- .bi_size = size,
+ .bi_size = size + seek,
};
struct bio_vec bv;