linux-next: manual merge of the vfs tree with the vfs-fixes tree

linux-next: manual merge of the vfs tree with the vfs-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1778 bytes --]

Hi all,

Today's linux-next merge of the vfs tree got a conflict in:

  kernel/cgroup/cgroup-internal.h

between commit:

  61aa329d0762 ("cgroup: saner refcounting for cgroup_root")

from the vfs-fixes tree and commit:

  b3678086951a ("kernfs, sysfs, cgroup, intel_rdt: Support fs_context")

from the vfs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc kernel/cgroup/cgroup-internal.h
index c9a35f09e4b9,ff86943ea1c8..000000000000
--- a/kernel/cgroup/cgroup-internal.h
+++ b/kernel/cgroup/cgroup-internal.h
@@@ -197,12 -213,10 +215,10 @@@ int cgroup_path_ns_locked(struct cgrou
  			  struct cgroup_namespace *ns);
  
  void cgroup_free_root(struct cgroup_root *root);
- void init_cgroup_root(struct cgroup_root *root, struct cgroup_sb_opts *opts);
+ void init_cgroup_root(struct cgroup_fs_context *ctx);
 -int cgroup_setup_root(struct cgroup_root *root, u16 ss_mask, int ref_flags);
 +int cgroup_setup_root(struct cgroup_root *root, u16 ss_mask);
  int rebind_subsystems(struct cgroup_root *dst_root, u16 ss_mask);
- struct dentry *cgroup_do_mount(struct file_system_type *fs_type, int flags,
- 			       struct cgroup_root *root, unsigned long magic,
- 			       struct cgroup_namespace *ns);
+ int cgroup_do_get_tree(struct fs_context *fc);
  
  int cgroup_migrate_vet_dst(struct cgroup *dst_cgrp);
  void cgroup_migrate_finish(struct cgroup_mgctx *mgctx);

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the vfs tree with the vfs-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 539 bytes --]

Hi all,

Today's linux-next merge of the vfs tree got a conflict in:

  kernel/cgroup/cgroup-v1.c

between commit:

  61aa329d0762 ("cgroup: saner refcounting for cgroup_root")

from the vfs-fixes tree and commit:

  b3678086951a ("kernfs, sysfs, cgroup, intel_rdt: Support fs_context")

from the vfs tree.

I couldn't figure out how to fix this up, so I effectively reverted the
vfs-fixes tree change.  Al, can you either do the merge yourself, or
provide me with a merge fix, please.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the vfs tree with the vfs-fixes tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2109 bytes --]

Hi all,

Today's linux-next merge of the vfs tree got a conflict in:

  Documentation/filesystems/porting.rst

between commit:

  2e7072350656 ("replace collect_mounts()/drop_collected_mounts() with safer variant")

from the vfs-fixes tree and commits:

  05fb0e666495 ("new helper: set_default_d_op()")
  691fb82ca6cc ("make d_set_d_op() static")

from the vfs tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc Documentation/filesystems/porting.rst
index 200226bfd6cf,579f17df46cf..000000000000
--- a/Documentation/filesystems/porting.rst
+++ b/Documentation/filesystems/porting.rst
@@@ -1249,9 -1252,18 +1249,27 @@@ an extra reference to new mount - it sh
  
  ---
  
 +collect_mounts()/drop_collected_mounts()/iterate_mounts() are gone now.
 +Replacement is collect_paths()/drop_collected_path(), with no special
 +iterator needed.  Instead of a cloned mount tree, the new interface returns
 +an array of struct path, one for each mount collect_mounts() would've
 +created.  These struct path point to locations in the caller's namespace
 +that would be roots of the cloned mounts.
++
++---
++
+ **mandatory**
+ 
+ If your filesystem sets the default dentry_operations, use set_default_d_op()
+ rather than manually setting sb->s_d_op.
+ 
+ ---
+ 
+ **mandatory**
+ 
+ d_set_d_op() is no longer exported (or public, for that matter); _if_
+ your filesystem really needed that, make use of d_splice_alias_ops()
+ to have them set.  Better yet, think hard whether you need different
+ ->d_op for different dentries - if not, just use set_default_d_op()
+ at mount time and be done with that.  Currently procfs is the only
+ thing that really needs ->d_op varying between dentries.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the vfs tree with the vfs-fixes tree

[Al Viro]

On Mon, Jun 23, 2025 at 09:12:50AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the vfs tree got a conflict in:
> 
>   Documentation/filesystems/porting.rst
> 
> between commit:
> 
>   2e7072350656 ("replace collect_mounts()/drop_collected_mounts() with safer variant")
> 
> from the vfs-fixes tree and commits:
> 
>   05fb0e666495 ("new helper: set_default_d_op()")
>   691fb82ca6cc ("make d_set_d_op() static")
> 
> from the vfs tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Sorry - should've folded that into #for-next.