* linux-next: manual merge of the vfs tree with the fs-next tree
@ 2025-09-15 16:28 Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2025-09-15 16:28 UTC (permalink / raw)
To: Al Viro
Cc: Christian Brauner, David Howells, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1727 bytes --]
Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
fs/afs/internal.h
between commit:
09c69289a2730 ("afs: Add support for RENAME_NOREPLACE and RENAME_EXCHANGE")
from the fs-next tree and commit:
09c2e9069e0fb ("afs_edit_dir_{add,remove}(): constify qstr argument")
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.
diff --cc fs/afs/internal.h
index 444a3ea4fdf65,1ce5deaf60193..0000000000000
--- a/fs/afs/internal.h
+++ b/fs/afs/internal.h
@@@ -1099,11 -1097,11 +1099,11 @@@ int afs_single_writepages(struct addres
/*
* dir_edit.c
*/
- extern void afs_edit_dir_add(struct afs_vnode *, struct qstr *, struct afs_fid *,
+ extern void afs_edit_dir_add(struct afs_vnode *, const struct qstr *, struct afs_fid *,
enum afs_edit_dir_reason);
- extern void afs_edit_dir_remove(struct afs_vnode *, struct qstr *, enum afs_edit_dir_reason);
+ extern void afs_edit_dir_remove(struct afs_vnode *, const struct qstr *, enum afs_edit_dir_reason);
-void afs_edit_dir_update_dotdot(struct afs_vnode *vnode, struct afs_vnode *new_dvnode,
- enum afs_edit_dir_reason why);
+void afs_edit_dir_update(struct afs_vnode *vnode, const struct qstr *name,
+ struct afs_vnode *new_dvnode, enum afs_edit_dir_reason why);
void afs_mkdir_init_dir(struct afs_vnode *dvnode, struct afs_vnode *parent_vnode);
/*
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the vfs tree with the fs-next tree
@ 2025-09-15 16:38 Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2025-09-15 16:38 UTC (permalink / raw)
To: Al Viro
Cc: Christian Brauner, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1704 bytes --]
Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
fs/namespace.c
between commit:
96ff702edaec8 ("mnt: support ns lookup")
from the fs-next tree and commit:
91e682db2fbe1 ("mnt_ns_tree_remove(): DTRT if mnt_ns had never been added to mnt_ns_list")
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.
diff --cc fs/namespace.c
index e3ac6e06be70d,aeeb33bf3e7b3..0000000000000
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@@ -153,10 -195,26 +161,10 @@@ static void mnt_ns_release_rcu(struct r
static void mnt_ns_tree_remove(struct mnt_namespace *ns)
{
/* remove from global mount namespace list */
- if (!is_anon_ns(ns))
- if (!list_empty(&ns->mnt_ns_list)) {
- mnt_ns_tree_write_lock();
- rb_erase(&ns->mnt_ns_tree_node, &mnt_ns_tree);
- list_bidir_del_rcu(&ns->mnt_ns_list);
- mnt_ns_tree_write_unlock();
- }
++ if (!list_empty(&ns->mnt_ns_list))
+ ns_tree_remove(ns);
- call_rcu(&ns->mnt_ns_rcu, mnt_ns_release_rcu);
-}
-
-static int mnt_ns_find(const void *key, const struct rb_node *node)
-{
- const u64 mnt_ns_id = *(u64 *)key;
- const struct mnt_namespace *ns = node_to_mnt_ns(node);
-
- if (mnt_ns_id < ns->seq)
- return -1;
- if (mnt_ns_id > ns->seq)
- return 1;
- return 0;
+ call_rcu(&ns->ns.ns_rcu, mnt_ns_release_rcu);
}
/*
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-09-15 16:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-15 16:28 linux-next: manual merge of the vfs tree with the fs-next tree Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2025-09-15 16:38 Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox