Message ID | 20170905092440.2172429-1-arnd@arndb.de |
---|---|
State | New |
Headers | show |
Series | cifs: hide unused functions | expand |
On Tue, Sep 5, 2017 at 11:24 AM, Arnd Bergmann <arnd@arndb.de> wrote: > The newly added SMB2+ attribute support causes unused function > warnings when CONFIG_CIFS_XATTR is disabled: > > fs/cifs/smb2ops.c:563:1: error: 'smb2_set_ea' defined but not used [-Werror=unused-function] > smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon, > fs/cifs/smb2ops.c:513:1: error: 'smb2_query_eas' defined but not used [-Werror=unused-function] > smb2_query_eas(const unsigned int xid, struct cifs_tcon *tcon, > > This adds another #ifdef around the affected functions. > > Fixes: 5517554e4313 ("cifs: Add support for writing attributes on SMB2+") > Fixes: 95907fea4fd8 ("cifs: Add support for reading attributes on SMB2+") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
merged into cifs-2.6.git for-next On Sun, Sep 10, 2017 at 5:28 AM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > On Tue, Sep 5, 2017 at 11:24 AM, Arnd Bergmann <arnd@arndb.de> wrote: >> The newly added SMB2+ attribute support causes unused function >> warnings when CONFIG_CIFS_XATTR is disabled: >> >> fs/cifs/smb2ops.c:563:1: error: 'smb2_set_ea' defined but not used [-Werror=unused-function] >> smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon, >> fs/cifs/smb2ops.c:513:1: error: 'smb2_query_eas' defined but not used [-Werror=unused-function] >> smb2_query_eas(const unsigned int xid, struct cifs_tcon *tcon, >> >> This adds another #ifdef around the affected functions. >> >> Fixes: 5517554e4313 ("cifs: Add support for writing attributes on SMB2+") >> Fixes: 95907fea4fd8 ("cifs: Add support for reading attributes on SMB2+") >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds > -- > To unsubscribe from this list: send the line "unsubscribe linux-cifs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index fb2934b9b97c..6cd91670ba2d 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -426,6 +426,7 @@ smb2_query_file_info(const unsigned int xid, struct cifs_tcon *tcon, return rc; } +#ifdef CONFIG_CIFS_XATTR static ssize_t move_smb2_ea_to_cifs(char *dst, size_t dst_size, struct smb2_file_full_ea_info *src, size_t src_size, @@ -613,6 +614,7 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon, return rc; } +#endif static bool smb2_can_echo(struct TCP_Server_Info *server)
The newly added SMB2+ attribute support causes unused function warnings when CONFIG_CIFS_XATTR is disabled: fs/cifs/smb2ops.c:563:1: error: 'smb2_set_ea' defined but not used [-Werror=unused-function] smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon, fs/cifs/smb2ops.c:513:1: error: 'smb2_query_eas' defined but not used [-Werror=unused-function] smb2_query_eas(const unsigned int xid, struct cifs_tcon *tcon, This adds another #ifdef around the affected functions. Fixes: 5517554e4313 ("cifs: Add support for writing attributes on SMB2+") Fixes: 95907fea4fd8 ("cifs: Add support for reading attributes on SMB2+") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- fs/cifs/smb2ops.c | 2 ++ 1 file changed, 2 insertions(+)