On Mon, 2024-07-29 at 15:48 -0700, Omar Sandoval wrote: > From: Omar Sandoval <osandov@xxxxxx> > > 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@xxxxxx> > --- > fs/locks.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/locks.c b/fs/locks.c > index 9afb16e0683f..e45cad40f8b6 100644 > --- a/fs/locks.c > +++ b/fs/locks.c > @@ -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) { Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
