From d3d3a50a426f7e9fd4ab5042360f4b88cd11ce66 Mon Sep 17 00:00:00 2001 From: Kai Germaschewski Date: Mon, 20 May 2002 03:59:06 -0500 Subject: [PATCH] Fix some compiler warnings Fix some trivial variable/functions/label defined (static) but not used warnings. --- drivers/block/floppy.c | 2 ++ drivers/scsi/sd.c | 2 +- fs/dnotify.c | 1 - net/ipv4/netfilter/ip_nat_core.c | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 5936d02cc679..b3d2a94c59ce 100644 --- 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 72296081bfbd..3f74662114de 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -61,7 +61,7 @@ #include -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 5152699a8493..a26be325d74e 100644 --- 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 50873f1890e7..f04a3c5a9aa8 100644 --- 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, -- 2.39.5