From: Borislav Petkov <bp@alien8.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Petr Vandrovec <petr@vandrovec.name>, Al Viro <viro@zeniv.linux.org.uk>
Subject: [PATCH] fs/ncpfs: Fix a build warning when CONFIG_NCPFS_NLS is not set
Date: Sun, 11 Sep 2016 11:49:55 +0200 [thread overview]
Message-ID: <20160911094955.13861-1-bp@alien8.de> (raw)
From: Borislav Petkov <bp@suse.de>
I get this when doing randconfig builds:
fs/ncpfs/dir.c: In function ‘ncp_hash_dentry’:
fs/ncpfs/dir.c:136:23: warning: unused variable ‘sb’ [-Wunused-variable]
struct super_block *sb = dentry->d_sb;
because NCP_IO_TABLE macro is NULL in the !CONFIG_NCPFS_NLS case and @sb
remains unused then.
Sticking it into the macro directly takes care of the warning and the
code is still readable. :)
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Petr Vandrovec <petr@vandrovec.name>
Cc: Al Viro <viro@zeniv.linux.org.uk>
---
fs/ncpfs/dir.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c
index 17de5c13dfae..f5b594e2457c 100644
--- a/fs/ncpfs/dir.c
+++ b/fs/ncpfs/dir.c
@@ -133,12 +133,11 @@ ncp_hash_dentry(const struct dentry *dentry, struct qstr *this)
return 0;
if (!ncp_case_sensitive(inode)) {
- struct super_block *sb = dentry->d_sb;
struct nls_table *t;
unsigned long hash;
int i;
- t = NCP_IO_TABLE(sb);
+ t = NCP_IO_TABLE(dentry->d_sb);
hash = init_name_hash(dentry);
for (i=0; i<this->len ; i++)
hash = partial_name_hash(ncp_tolower(t, this->name[i]),
--
2.10.0
reply other threads:[~2016-09-11 10:18 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20160911094955.13861-1-bp@alien8.de \
--to=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=petr@vandrovec.name \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®