From a2a53aaa75b5107c0de51f54a4f748b5ca5511c4 Mon Sep 17 00:00:00 2001 From: Denis Kirjanov Date: Nov 11 2021 12:18:45 +0000 Subject: Merge remote-tracking branch 'origin/users/mkubecek/SLE15-SP2/submit' into SLE15-SP3 --- diff --git a/patches.suse/NFS-Do-uncached-readdir-when-we-re-seeking-a-cookie-.patch b/patches.suse/NFS-Do-uncached-readdir-when-we-re-seeking-a-cookie-.patch index cebe7e1..2638770 100644 --- a/patches.suse/NFS-Do-uncached-readdir-when-we-re-seeking-a-cookie-.patch +++ b/patches.suse/NFS-Do-uncached-readdir-when-we-re-seeking-a-cookie-.patch @@ -4,7 +4,7 @@ Subject: [PATCH] NFS: Do uncached readdir when we're seeking a cookie in an empty page cache Git-commit: 794092c57f89c2c833da00f82f38a0afcb4033bc Patch-mainline: v5.11-rc1 -References: bsc#1191628 +References: bsc#1191628 bsc#1192549 If the directory is changing, causing the page cache to get invalidated while we are listing the contents, then the NFS client is currently forced @@ -44,7 +44,7 @@ Acked-by: NeilBrown + * Default to uncached readdir if the page cache is empty, and + * we're looking for a non-zero cookie in a large directory. + */ -+ return desc->dir_cookie != 0 && mapping->nrpages == 0 && size > dtsize; ++ return *desc->dir_cookie != 0 && mapping->nrpages == 0 && size > dtsize; +} + /* Search for desc->dir_cookie from the beginning of the page cache */