* linux-next: manual merge of the bcachefs tree with the mm tree
@ 2023-10-31 22:50 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2023-10-31 22:50 UTC (permalink / raw)
To: Kent Overstreet, Andrew Morton
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2660 bytes --]
Hi all,
Today's linux-next merge of the bcachefs tree got conflicts in:
fs/bcachefs/btree_cache.c
fs/bcachefs/btree_key_cache.c
between commit:
e1ae18bfd5bc ("Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm")
(this merge commit includes fix up for the shrinker allocation changes)
from the mm tree and commit:
a1d97d8417d3 ("bcachefs: Fix shrinker names")
from the bcachefs 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 fs/bcachefs/btree_cache.c
index 5e5858191905,0b084fbc478a..000000000000
--- a/fs/bcachefs/btree_cache.c
+++ b/fs/bcachefs/btree_cache.c
@@@ -472,15 -473,12 +472,15 @@@ int bch2_fs_btree_cache_init(struct bch
mutex_init(&c->verify_lock);
- shrink = shrinker_alloc(0, "%s/btree_cache", c->name);
- bc->shrink.count_objects = bch2_btree_cache_count;
- bc->shrink.scan_objects = bch2_btree_cache_scan;
- bc->shrink.seeks = 4;
- ret = register_shrinker(&bc->shrink, "%s-btree_cache", c->name);
- if (ret)
++ shrink = shrinker_alloc(0, "%s-btree_cache", c->name);
+ if (!shrink)
goto err;
+ bc->shrink = shrink;
+ shrink->count_objects = bch2_btree_cache_count;
+ shrink->scan_objects = bch2_btree_cache_scan;
+ shrink->seeks = 4;
+ shrink->private_data = c;
+ shrinker_register(shrink);
return 0;
err:
diff --cc fs/bcachefs/btree_key_cache.c
index f9a5e38a085b,3304bff7d464..000000000000
--- a/fs/bcachefs/btree_key_cache.c
+++ b/fs/bcachefs/btree_key_cache.c
@@@ -1038,15 -1039,11 +1038,15 @@@ int bch2_fs_btree_key_cache_init(struc
bc->table_init_done = true;
- shrink = shrinker_alloc(0, "%s/btree_key_cache", c->name);
- bc->shrink.seeks = 0;
- bc->shrink.count_objects = bch2_btree_key_cache_count;
- bc->shrink.scan_objects = bch2_btree_key_cache_scan;
- if (register_shrinker(&bc->shrink, "%s-btree_key_cache", c->name))
++ shrink = shrinker_alloc(0, "%s-btree_key_cache", c->name);
+ if (!shrink)
return -BCH_ERR_ENOMEM_fs_btree_cache_init;
+ bc->shrink = shrink;
+ shrink->seeks = 0;
+ shrink->count_objects = bch2_btree_key_cache_count;
+ shrink->scan_objects = bch2_btree_key_cache_scan;
+ shrink->private_data = c;
+ shrinker_register(shrink);
return 0;
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the bcachefs tree with the mm tree
@ 2024-09-11 0:50 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2024-09-11 0:50 UTC (permalink / raw)
To: Kent Overstreet, Andrew Morton
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Michal Hocko,
Youling Tang
[-- Attachment #1: Type: text/plain, Size: 1366 bytes --]
Hi all,
Today's linux-next merge of the fs-next tree got a conflict in:
fs/bcachefs/fs.c
between commit:
3346ada04cf5 ("bcachefs: do not use PF_MEMALLOC_NORECLAIM")
from the mm-unstable branch of the mm tree and commit:
082330c36194 ("bcachefs: allocate inode by using alloc_inode_sb()")
from the bcachefs 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 fs/bcachefs/fs.c
index a7c5570c4084,fd6ac91c9b75..000000000000
--- a/fs/bcachefs/fs.c
+++ b/fs/bcachefs/fs.c
@@@ -239,9 -283,10 +283,10 @@@ static struct inode *bch2_alloc_inode(s
BUG();
}
-static struct bch_inode_info *__bch2_new_inode(struct bch_fs *c)
+static struct bch_inode_info *__bch2_new_inode(struct bch_fs *c, gfp_t gfp)
{
- struct bch_inode_info *inode = kmem_cache_alloc(bch2_inode_cache, gfp);
+ struct bch_inode_info *inode = alloc_inode_sb(c->vfs_sb,
- bch2_inode_cache, GFP_NOFS);
++ bch2_inode_cache, gfp);
if (!inode)
return NULL;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-09-11 0:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-31 22:50 linux-next: manual merge of the bcachefs tree with the mm tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-09-11 0:50 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox