diff options
| author | Vlastimil Babka <vbabka@suse.cz> | 2024-09-13 11:13:03 +0200 |
|---|---|---|
| committer | Vlastimil Babka <vbabka@suse.cz> | 2024-09-13 11:13:03 +0200 |
| commit | ecc4d6af979b3bd4d239ff80bbba455c90d3f4f3 (patch) | |
| tree | f42df8888b5032a54a5bf80721435ae9a31137d5 /fs/locks.c | |
| parent | a715e94dbda4ece41aac49b7b7ff8ddb55a7fe08 (diff) | |
| parent | 4b7ff9ab98af11a477d50f08382bcc4c2f899926 (diff) | |
Merge branch 'slab/for-6.12/kmem_cache_args' into slab/for-next
Merge kmem_cache_create() refactoring by Christian Brauner.
Note this includes a merge of the vfs.file tree that contains the
prerequisity kmem_cache_create_rcu() work.
Diffstat (limited to 'fs/locks.c')
| -rw-r--r-- | fs/locks.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c index e45cad40f8b6..b51b1c395ce6 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -1451,7 +1451,7 @@ int lease_modify(struct file_lease *fl, int arg, struct list_head *dispose) struct file *filp = fl->c.flc_file; f_delown(filp); - filp->f_owner.signum = 0; + file_f_owner(filp)->signum = 0; fasync_helper(0, fl->c.flc_file, 0, &fl->fl_fasync); if (fl->fl_fasync != NULL) { printk(KERN_ERR "locks_delete_lock: fasync == %p\n", fl->fl_fasync); @@ -1783,6 +1783,10 @@ generic_add_lease(struct file *filp, int arg, struct file_lease **flp, void **pr lease = *flp; trace_generic_add_lease(inode, lease); + error = file_f_owner_allocate(filp); + if (error) + return error; + /* Note that arg is never F_UNLCK here */ ctx = locks_get_lock_context(inode, arg); if (!ctx) |