]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
filelock: fix name of file_lease slab cache
authorOmar Sandoval <osandov@fb.com>
Mon, 29 Jul 2024 22:48:12 +0000 (15:48 -0700)
committerChristian Brauner <brauner@kernel.org>
Mon, 12 Aug 2024 20:03:25 +0000 (22:03 +0200)
When struct file_lease was split out from struct file_lock, the name of
the file_lock slab cache was copied to the new slab cache for
file_lease. This name conflict causes confusion in /proc/slabinfo and
/sys/kernel/slab. In particular, it caused failures in drgn's test case
for slab cache merging.

Link: https://github.com/osandov/drgn/blob/9ad29fd86499eb32847473e928b6540872d3d59a/tests/linux_kernel/helpers/test_slab.py#L81
Fixes: c69ff4071935 ("filelock: split leases out of struct file_lock")
Signed-off-by: Omar Sandoval <osandov@fb.com>
Link: https://lore.kernel.org/r/2d1d053da1cafb3e7940c4f25952da4f0af34e38.1722293276.git.osandov@fb.com
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
fs/locks.c

index 9afb16e0683ffd0ff0430849686dc6ea8b8640f9..e45cad40f8b6bd0ffe007c706eac989082307fae 100644 (file)
@@ -2984,7 +2984,7 @@ static int __init filelock_init(void)
        filelock_cache = kmem_cache_create("file_lock_cache",
                        sizeof(struct file_lock), 0, SLAB_PANIC, NULL);
 
-       filelease_cache = kmem_cache_create("file_lock_cache",
+       filelease_cache = kmem_cache_create("file_lease_cache",
                        sizeof(struct file_lease), 0, SLAB_PANIC, NULL);
 
        for_each_possible_cpu(i) {