diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-19 06:24:50 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-19 06:24:50 +0200 |
commit | ebbe30f4bba127505c5664dd67f519e5e06d16be (patch) | |
tree | 7285f44ba6e74a25876982cb50f9a430169cc42e /fs/locks.c | |
parent | 6pack: propagage new tty types (diff) | |
parent | Linux 6.11-rc4 (diff) | |
download | linux-ebbe30f4bba127505c5664dd67f519e5e06d16be.tar.xz linux-ebbe30f4bba127505c5664dd67f519e5e06d16be.zip |
Merge 6.11-rc4 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/locks.c')
-rw-r--r-- | fs/locks.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |