From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@ZenIV•linux.org.uk>, Steve French <smfrench@gmail•com>
Cc: "Atte Heikkilä" <atteh.mailbox@gmail•com>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Steve French" <stfrench@microsoft•com>
Subject: linux-next: manual merge of the vfs tree with the ksmbd tree
Date: Thu, 6 Oct 2022 10:59:13 +1100 [thread overview]
Message-ID: <20221006105913.5be8a631@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1649 bytes --]
Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
fs/ksmbd/vfs.c
between commit:
dbab80e2071a ("ksmbd: make utf-8 file name comparison work in __caseless_lookup()")
from the ksmbd tree and commit:
25885a35a720 ("Change calling conventions for filldir_t")
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/ksmbd/vfs.c
index 8d8af724df70,48b2b901f6e5..000000000000
--- a/fs/ksmbd/vfs.c
+++ b/fs/ksmbd/vfs.c
@@@ -1150,23 -1149,13 +1148,23 @@@ static bool __caseless_lookup(struct di
buf = container_of(ctx, struct ksmbd_readdir_data, ctx);
if (buf->used != namlen)
- return 0;
+ return true;
- if (!strncasecmp((char *)buf->private, name, namlen)) {
+ if (IS_ENABLED(CONFIG_UNICODE) && buf->um) {
+ const struct qstr q_buf = {.name = buf->private,
+ .len = buf->used};
+ const struct qstr q_name = {.name = name,
+ .len = namlen};
+
+ cmp = utf8_strncasecmp(buf->um, &q_buf, &q_name);
+ }
+ if (cmp < 0)
+ cmp = strncasecmp((char *)buf->private, name, namlen);
+ if (!cmp) {
memcpy((char *)buf->private, name, namlen);
buf->dirent_count = 1;
- return -EEXIST;
+ return false;
}
- return 0;
+ return true;
}
/**
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-10-05 23:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-05 23:59 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-04-21 12:38 linux-next: manual merge of the vfs tree with the ksmbd tree broonie
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=20221006105913.5be8a631@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=atteh.mailbox@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=smfrench@gmail$(echo .)com \
--cc=stfrench@microsoft$(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