summaryrefslogtreecommitdiff
path: root/fs/nfs/super.c
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@hammerspace.com>2020-05-10 16:30:42 +0300
committerTrond Myklebust <trond.myklebust@hammerspace.com>2020-05-11 21:06:50 +0300
commit2b666a110b493b3e8fbf561718ae794e13813651 (patch)
tree70f764c8314acc897c9b62524244f363e8926ef0 /fs/nfs/super.c
parentce99aa62e1eb793e259d023c7f6ccb7c4879917b (diff)
parent7bb0c5338436dae953622470d52689265867f032 (diff)
downloadlinux-2b666a110b493b3e8fbf561718ae794e13813651.tar.xz
Merge tag 'fscache-fixes-20200508-2' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
(1) The reorganisation of bmap() use accidentally caused the return value of cachefiles_read_or_alloc_pages() to get corrupted. (2) The NFS superblock index key accidentally got changed to include a number of kernel pointers - meaning that the key isn't matchable after a reboot. (3) A redundant check in nfs_fscache_get_super_cookie(). (4) The NFS change_attr sometimes set in the auxiliary data for the caching of an file and sometimes not, which causes the cache to get discarded when it shouldn't. (5) There's a race between cachefiles_read_waiter() and cachefiles_read_copier() that causes an occasional assertion failure.
Diffstat (limited to 'fs/nfs/super.c')
-rw-r--r--fs/nfs/super.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index bdb6d0c2e755..7a70287f21a2 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1189,7 +1189,6 @@ static void nfs_get_cache_cookie(struct super_block *sb,
uniq = ctx->fscache_uniq;
ulen = strlen(ctx->fscache_uniq);
}
- return;
}
nfs_fscache_get_super_cookie(sb, uniq, ulen);