lkml.org 
[lkml]   [2016]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] fs/ncpfs: Fix a build warning when CONFIG_NCPFS_NLS is not set
Date
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
\
 
 \ /
  Last update: 2016-09-17 09:59    [W:0.027 / U:1.764 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site