From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@ZenIV•linux.org.uk>, Miklos Szeredi <miklos@szeredi•hu>
Cc: Bernd Schubert <bschubert@ddn•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Miklos Szeredi <mszeredi@redhat•com>
Subject: linux-next: manual merge of the vfs tree with the fuse tree
Date: Fri, 24 Jan 2025 09:16:43 +1100 [thread overview]
Message-ID: <20250124091643.108d1a02@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1589 bytes --]
Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
fs/fuse/dir.c
between commit:
e24b7a3b70ae ("fuse: make args->in_args[0] to be always the header")
from the fuse tree and commit:
d6726de37cbf ("fuse_dentry_revalidate(): use stable parent inode and name passed by caller")
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 fs/fuse/dir.c
index be693a8a1010,3019bc1d9f9d..000000000000
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@@ -175,10 -175,11 +175,12 @@@ static void fuse_lookup_init(struct fus
memset(outarg, 0, sizeof(struct fuse_entry_out));
args->opcode = FUSE_LOOKUP;
args->nodeid = nodeid;
-- args->in_numargs = 2;
- args->in_args[0].size = name->len;
- args->in_args[0].value = name->name;
- args->in_args[1].size = 1;
- args->in_args[1].value = "";
++ args->in_numargs = 3;
+ fuse_set_zero_arg0(args);
- args->in_args[1].size = name->len + 1;
++ args->in_args[1].size = name->len;
+ args->in_args[1].value = name->name;
++ args->in_args[2].size = 1;
++ args->in_args[2].value = "";
args->out_numargs = 1;
args->out_args[0].size = sizeof(struct fuse_entry_out);
args->out_args[0].value = outarg;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-01-23 22:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-23 22:16 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-02-06 22:14 linux-next: manual merge of the vfs tree with the fuse tree Stephen Rothwell
2019-08-30 3:01 Stephen Rothwell
2019-09-02 9:00 ` Miklos Szeredi
2019-09-02 15:10 ` Miklos Szeredi
2019-09-02 15:30 ` Al Viro
2019-09-02 23:23 ` Stephen Rothwell
2019-09-02 23:29 ` Al Viro
2019-05-06 23:53 Stephen Rothwell
2019-05-08 1:01 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250124091643.108d1a02@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bschubert@ddn$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miklos@szeredi$(echo .)hu \
--cc=mszeredi@redhat$(echo .)com \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox