Fix some compiler warnings

Fix some trivial variable/functions/label defined (static) but not used
warnings.

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 5936d02cc679a029aeccb4f5453aa1b38022a56c..b3d2a94c59ce9b9150685a2cafc049246cdd32a2 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3859,7 +3859,9 @@ static int check_floppy_change(kdev_t dev)
 static int floppy_revalidate(kdev_t dev)
 {
 #define NO_GEOM (!current_type[drive] && !TYPE(dev))
+#if 0
        struct buffer_head * bh;
+#endif
        int drive=DRIVE(dev);
        int cf;
 

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 72296081bfbd203bd6d8288b87d09c1cfdeb23df..3f74662114de60be236ba8879ca6a8ce06deb2dc 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -61,7 +61,7 @@
 
 #include <linux/genhd.h>
 
-static char sd_version_str[] = "Version: 2.0.3 (20020417)";
+/* static char sd_version_str[] = "Version: 2.0.3 (20020417)"; */
 
 #define SD_MAJOR(i) (!(i) ? SCSI_DISK0_MAJOR : SCSI_DISK1_MAJOR-1+(i))
 

diff --git a/fs/dnotify.c b/fs/dnotify.c
index 5152699a849359eb4404e3ef7ba0744e8af12dc5..a26be325d74ece0064b643cbd964f3e1addaf594 100644 (file)
--- a/fs/dnotify.c
+++ b/fs/dnotify.c
@@ -135,7 +135,6 @@ void __inode_dir_notify(struct inode *inode, unsigned long event)
        }
        if (changed)
                redo_inode_mask(inode);
-out:
        write_unlock(&dn_lock);
 }
 

diff --git a/net/ipv4/netfilter/ip_nat_core.c b/net/ipv4/netfilter/ip_nat_core.c
index 50873f1890e72d0e6c25c22b371741d99ace8508..f04a3c5a9aa8e279742b509ff044c20c303d6b8a 100644 (file)
--- a/net/ipv4/netfilter/ip_nat_core.c
+++ b/net/ipv4/netfilter/ip_nat_core.c
@@ -203,6 +203,7 @@ find_appropriate_src(const struct ip_conntrack_tuple *tuple,
                return NULL;
 }
 
+#ifdef CONFIG_IP_NF_NAT_LOCAL
 /* If it's really a local destination manip, it may need to do a
    source manip too. */
 static int
@@ -221,6 +222,7 @@ do_extra_mangle(u_int32_t var_ip, u_int32_t *other_ipp)
        ip_rt_put(rt);
        return 1;
 }
+#endif
 
 /* Simple way to iterate through all. */
 static inline int fake_cmp(const struct ip_nat_hash *i,