]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jul 2025 17:32:20 +0000 (10:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jul 2025 17:32:20 +0000 (10:32 -0700)
Pull misc VFS updates from Al Viro:
 "VFS-related cleanups in various places (mostly of the "that really
  can't happen" or "there's a better way to do it" variety)"

* tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  gpib: use file_inode()
  binder_ioctl_write_read(): simplify control flow a bit
  secretmem: move setting O_LARGEFILE and bumping users' count to the place where we create the file
  apparmor: file never has NULL f_path.mnt
  landlock: opened file never has a negative dentry

1  2 
drivers/android/binder.c
mm/secretmem.c

Simple merge
diff --cc mm/secretmem.c
index e042a4a0bc0cfae30be68947f7a37c998f1964bf,ef4922baa1cdd9bf7b75f9c8d3a6116893a0d65f..b7c5592d6711cd116a43c7b5165e2fc8a1c58d33
@@@ -200,8 -201,14 +200,8 @@@ static struct file *secretmem_file_crea
        if (IS_ERR(inode))
                return ERR_CAST(inode);
  
 -      err = security_inode_init_security_anon(inode, &QSTR(anon_name), NULL);
 -      if (err) {
 -              file = ERR_PTR(err);
 -              goto err_free_inode;
 -      }
 -
        file = alloc_file_pseudo(inode, secretmem_mnt, "secretmem",
-                                O_RDWR, &secretmem_fops);
+                                O_RDWR | O_LARGEFILE, &secretmem_fops);
        if (IS_ERR(file))
                goto err_free_inode;