]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
cifs: hide unused functions
authorArnd Bergmann <arnd@arndb.de>
Tue, 27 Jun 2017 15:06:13 +0000 (17:06 +0200)
committerSteve French <smfrench@gmail.com>
Thu, 6 Jul 2017 00:58:02 +0000 (19:58 -0500)
Some functions are only referenced under an #ifdef, causing a harmless
warning:

fs/cifs/smb2ops.c:1374:1: error: 'get_smb2_acl' defined but not used [-Werror=unused-function]

We could mark them __maybe_unused or add another #ifdef, I picked
the second approach here.

Fixes: b3fdda4d1e1b ("cifs: Use smb 2 - 3 and cifsacl mount options getacl functions")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Steve French <smfrench@gmail.com>
fs/cifs/smb2ops.c

index f1d9c191c4e41b32178aa1bff8d0d5ecf655395b..323bafdd790942260c378ba96c62e189d6a9b9a0 100644 (file)
@@ -1288,6 +1288,7 @@ smb2_query_symlink(const unsigned int xid, struct cifs_tcon *tcon,
        return rc;
 }
 
+#ifdef CONFIG_CIFS_ACL
 static struct cifs_ntsd *
 get_smb2_acl_by_fid(struct cifs_sb_info *cifs_sb,
                const struct cifs_fid *cifsfid, u32 *pacllen)
@@ -1387,7 +1388,7 @@ get_smb2_acl(struct cifs_sb_info *cifs_sb,
        cifsFileInfo_put(open_file);
        return pntsd;
 }
-
+#endif
 
 static long smb3_zero_range(struct file *file, struct cifs_tcon *tcon,
                            loff_t offset, loff_t len, bool keep_size)