Hi all,
Today's linux-next merge of the fscache tree got a conflict in:
fs/cachefiles/bind.c
between commit:
bb49e9e730c2 ("fs: add is_idmapped_mnt() helper")
from the pidfd tree and commit:
d18c9010376b ("cachefiles: Delete the cachefiles driver pending rewrite")
from the fscache tree.
I fixed it up (the latter deleted the file, so I did that and then added
the following patch) 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.
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 6 Dec 2021 09:05:07 +1100
Subject: [PATCH] fix up for "fs: add is_idmapped_mnt() helper"
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
fs/cachefiles/cache.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/cachefiles/cache.c b/fs/cachefiles/cache.c
index 327cea71557f..e0aa8bf429b8 100644
--- a/fs/cachefiles/cache.c
+++ b/fs/cachefiles/cache.c
@@ -44,7 +44,7 @@ int cachefiles_add_cache(struct cachefiles_cache *cache)
root = path.dentry;
ret = -EINVAL;
- if (mnt_user_ns(path.mnt) != &init_user_ns) {
+ if (is_idmapped_mnt(path.mnt)) {
pr_warn("File cache on idmapped mounts not supported");
goto error_unsupported;
}
--
2.33.0
--
Cheers,
Stephen Rothwell
Attachment:
pgpXeYuHvLWw0.pgp
Description: OpenPGP digital signature
