fs/isofs/namei.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
Use QSTR_LEN() and inline the code in isofs_cmp(). Remove the stale
function comment while at it.
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
fs/isofs/namei.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c
index 8dd3911717e0..3ace3d6a55e7 100644
--- a/fs/isofs/namei.c
+++ b/fs/isofs/namei.c
@@ -10,20 +10,13 @@
#include <linux/gfp.h>
#include "isofs.h"
-/*
- * ok, we cannot use strncmp, as the name is not in our data space.
- * Thus we'll have to use isofs_match. No big problem. Match also makes
- * some sanity tests.
- */
static int
isofs_cmp(struct dentry *dentry, const char *compare, int dlen)
{
- struct qstr qstr;
- qstr.name = compare;
- qstr.len = dlen;
if (likely(!dentry->d_op))
return dentry->d_name.len != dlen || memcmp(dentry->d_name.name, compare, dlen);
- return dentry->d_op->d_compare(NULL, dentry->d_name.len, dentry->d_name.name, &qstr);
+ return dentry->d_op->d_compare(NULL, dentry->d_name.len, dentry->d_name.name,
+ &QSTR_LEN(compare, dlen));
}
/*
On Mon 20-04-26 12:25:46, Thorsten Blum wrote:
> Use QSTR_LEN() and inline the code in isofs_cmp(). Remove the stale
> function comment while at it.
>
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Thanks. I've added the patch to my tree.
Honza
> ---
> fs/isofs/namei.c | 11 ++---------
> 1 file changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c
> index 8dd3911717e0..3ace3d6a55e7 100644
> --- a/fs/isofs/namei.c
> +++ b/fs/isofs/namei.c
> @@ -10,20 +10,13 @@
> #include <linux/gfp.h>
> #include "isofs.h"
>
> -/*
> - * ok, we cannot use strncmp, as the name is not in our data space.
> - * Thus we'll have to use isofs_match. No big problem. Match also makes
> - * some sanity tests.
> - */
> static int
> isofs_cmp(struct dentry *dentry, const char *compare, int dlen)
> {
> - struct qstr qstr;
> - qstr.name = compare;
> - qstr.len = dlen;
> if (likely(!dentry->d_op))
> return dentry->d_name.len != dlen || memcmp(dentry->d_name.name, compare, dlen);
> - return dentry->d_op->d_compare(NULL, dentry->d_name.len, dentry->d_name.name, &qstr);
> + return dentry->d_op->d_compare(NULL, dentry->d_name.len, dentry->d_name.name,
> + &QSTR_LEN(compare, dlen));
> }
>
> /*
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
© 2016 - 2026 Red Hat, Inc.