]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
smack: Fix gcc warning from unused smack_syslog_lock mutex in smackfs.c
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Mon, 23 Mar 2015 18:03:17 +0000 (14:03 -0400)
committerCasey Schaufler <casey@schaufler-ca.com>
Mon, 23 Mar 2015 20:24:02 +0000 (13:24 -0700)
In commit 00f84f3f2e9d088f06722f4351d67f5f577abe22 ("Smack: Make the
syslog control configurable") this mutex was added, but the rest of
the final commit never actually made use of it, resulting in:

 In file included from include/linux/mutex.h:29:0,
                  from include/linux/notifier.h:13,
                  from include/linux/memory_hotplug.h:6,
                  from include/linux/mmzone.h:821,
                  from include/linux/gfp.h:5,
                  from include/linux/slab.h:14,
                  from include/linux/security.h:27,
                  from security/smack/smackfs.c:21:
 security/smack/smackfs.c:63:21: warning: ‘smack_syslog_lock’ defined but not used [-Wunused-variable]
  static DEFINE_MUTEX(smack_syslog_lock);
                      ^

A git grep shows no other instances/references to smack_syslog_lock.
Delete it, assuming that the mutex addition was just a leftover from
an earlier work in progress version of the change.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
security/smack/smackfs.c

index deb3d3bfbbf3e4bb71e82049914aa7acf2e62b7b..06f719ed63c952cf5b27f8cfbe807fce514b6772 100644 (file)
@@ -64,7 +64,6 @@ enum smk_inos {
  */
 static DEFINE_MUTEX(smack_cipso_lock);
 static DEFINE_MUTEX(smack_ambient_lock);
-static DEFINE_MUTEX(smack_syslog_lock);
 static DEFINE_MUTEX(smk_netlbladdr_lock);
 
 /*