Re: [PATCH] ext3: Fix warning without quota support (was: Linux 2.6.14)

Re: [PATCH] ext3: Fix warning without quota support (was: Linux 2.6.14)

[Nick Warne]

> Sorry for not spotting this one earlier...
>
> Fix the following warning when ext3 fs is compiled without quota
> support:
>
> fs/ext3/super.c: In function `ext3_show_options':
> fs/ext3/super.c:516: warning: unused variable `sbi'

I have added this small fix to my 2.6.14.2 build.  A quick question.

What does GCC do here - does it just drop and ignore the unused variable?

Nick
-- 
http://sourceforge.net/projects/quake2plus

"Person who say it cannot be done should not interrupt person doing it."
-Chinese Proverb

Re: [PATCH] ext3: Fix warning without quota support (was: Linux 2.6.14)

[Jean Delvare]

Hi Nick,

> > Fix the following warning when ext3 fs is compiled without quota
> > support:
> >
> > fs/ext3/super.c: In function `ext3_show_options':
> > fs/ext3/super.c:516: warning: unused variable `sbi'
> 
> I have added this small fix to my 2.6.14.2 build.  A quick question.

Let is be noted that this warning was fixed in a completely different
way in Linus' tree already. My patch is not meant for -stable either,
as it doesn't fix any real problem.

> What does GCC do here - does it just drop and ignore the unused variable?

Without optimizations, gcc 3.3.6 keeps the variable although it won't
ever be used. With -O1 and above (including -Os) it drops the unused
variable.

-- 
Jean Delvare

Re: [PATCH] ext3: Fix warning without quota support (was: Linux 2.6.14)

[Nick Warne]

Hi Jean,

On Saturday 12 November 2005 15:31, Jean Delvare wrote:
> Hi Nick,
>
> > I have added this small fix to my 2.6.14.2 build.  A quick question.
>
> Let is be noted that this warning was fixed in a completely different
> way in Linus' tree already. My patch is not meant for -stable either,
> as it doesn't fix any real problem.

I see (or didn't).  Isn't it hard to keep up with all this.  Kernel developers 
are unstoppable... how Linus/Andrew/Alan/all_the_rest keep on top of it all I 
don't know - wonderful stuff.

> > What does GCC do here - does it just drop and ignore the unused variable?
>
> Without optimizations, gcc 3.3.6 keeps the variable although it won't
> ever be used. With -O1 and above (including -Os) it drops the unused
> variable.

Thanks!  I didn't know that at all.

Nick
-- 
http://sourceforge.net/projects/quake2plus

"Person who say it cannot be done should not interrupt person doing it."
-Chinese Proverb

Linux 2.6.14

[Linus Torvalds]

Ok, it's finally there. 

2.6.14 was delayed twice due to some last-minute bug-reports, some of 
which ended up being false alarms (hey, I should be happy, but it was a 
bit frustrating)

But hey, the delays - even when perhaps unnecessary - got us to look at 
the code and fix some other bugs instead. So it's all good.

So special thanks go to Oleg Nesterov and Roland McGrath for doing some 
code inspection and fixing and just making the otherwise frustrating wait 
for bug resolution more productive ;^p.

Let's try the 2-week merge window thing again, I think it worked pretty 
well despite the delays, and hopefully it will work even better this time 
around.

The actual changes from 2.6.14-rc5 are a number of mostly one-liners, with 
the ShortLog appended (full log from 2.6.13 on the normal sites together 
with the release itself). The only slightly bigger ones (ie more than a 
handful of lines) is a kernel parameter doc update, and the PIIX4 PCI 
quirk printouts, and the cleanups/fixes for the posix cpu timers.

(In fact, according to diffstat, about half the diff is that one 
documentation update, and most of that is whitespace cleanups)

		Linus

----
Alan Stern:
      [SCSI] Fix leak of Scsi_Cmnds

Andrew Morton:
      inotify/idr leak fix
      alpha: atomic dependency fix
      qlogic lockup fix
      export cpu_online_map
      svcsock timestamp fix

Ben Dooks:
      [ARM] 3026/1: S3C2410 - avoid possible overflow in pll calculations
      [ARM] 3027/1: BAST - reduce NAND timings slightly
      [ARM] 3028/1: S3C2410 - add DCLK mask definitions

Benjamin Herrenschmidt:
      ppc64: Fix pages marked dirty abusively
      ppc64: Fix wrong register mapping in mpic driver

Bjorn Helgaas:
      [SERIAL] support the Exsys EX-4055 4S four-port card

Chris Wright:
      typo fix in last cpufreq powernow patch

Christoph Hellwig:
      [SCSI] mptsas: fix phy identifiers

Dave Airlie:
      drm: another mga bug

Dave Jones:
      cpufreq: fix pending powernow timer stuck condition
      cpufreq: SMP fix for conservative governor

Davi Arnaut:
      SELinux: handle sel_make_bools() failure in selinuxfs

David Gibson:
      ppc64: Fix typo bug in iSeries hash code

Eric Moore:
      mptsas: fix phy identifiers

Herbert Xu:
      [DCCP]: Use skb_set_owner_w in dccp_transmit_skb when skb->sk is NULL
      [DCCP]: Make dccp_write_xmit always free the packet
      [DCCP]: Clear the IPCB area
      [TCP] Allow len == skb->len in tcp_fragment
      [NEIGH] Print stack trace in neigh_add_timer
      [NEIGH] Fix add_timer race in neigh_add_timer
      [NEIGH] Fix timer leak in neigh_changeaddr
      [TCP]: Clear stale pred_flags when snd_wnd changes

Hugh Dickins:
      Fix handling spurious page fault for hugetlb region

Ian Campbell:
      [ARM] 3032/1: sparse: complains about generic_fls() prototype in asm-arm/bitops.h

Ivan Kokshaysky:
      alpha: additional smp barriers
      fix radeon_cp_init_ring_buffer()

James Simmons:
      Return the line length via sysfs for fbdev

James.Smart@Emulex.Com:
      [SCSI] FW: for Deadlock in transport_fc

Jeff Garzik:
      kill massive wireless-related log spam

Jochen Friedrich:
      [TR]: Preserve RIF flag even for 2 byte RIF fields.
      [LLC]: Strip RIF flag from source MAC address

Julian Anastasov:
      [SK_BUFF]: ipvs_property field must be copied

Justin Chen:
      [SERIAL] new hp diva console port

Karl Magnus Kolstoe:
      [SCSI] 2.6.13.3; add Pioneer DRM-624x to drivers/scsi/scsi_devinfo.c

Kostik Belousov:
      aio syscalls are not checked by lsm

Linus Torvalds:
      Revert "Fix cpu timers exit deadlock and races"
      Posix timers: limit number of timers firing at once
      cardbus: limit IO windows to 256 bytes
      PCI: be more verbose about resource quirks
      posix cpu timers: fix timer ordering
      Revert "remove false BUG_ON() from run_posix_cpu_timers()"
      Revert "x86-64: Avoid unnecessary double bouncing for swiotlb"
      Linux v2.6.14

Magnus Damm:
      NUMA: broken per cpu pageset counters

Matt Reimer:
      [ARM] 3025/1: Add I2S platform device for PXA

Mike Krufky:
      Kconfig: saa7134-dvb should not select cx22702

Miklos Szeredi:
      uml: fix compile failure for TT mode

NeilBrown:
      md: make sure mdthreads will always respond to kthread_stop

Oleg Nesterov:
      posix-timers: fix cleanup_timers() and run_posix_cpu_timers() races
      posix-timers: remove false BUG_ON() from run_posix_cpu_timers()
      posix-timers: exit path cleanup
      posix-timers: fix posix_cpu_timer_set() vs run_posix_cpu_timers() race
      Fix cpu timers expiration time

Paul Mackerras:
      ppc64: Fix typo in time calculations

Pavel Machek:
      [ARM] fix sharp zaurus c-3000 compile failure without CONFIG_FB_PXA

Peter Wainwright:
      Fix HFS+ to free up the space when a file is deleted.

Ralf Baechle:
      [AX.25]: Fix signed char bug

Randy Dunlap:
      [SCSI] NCR5380: fix undefined preprocessor identifier
      kernel-parameters cleanup

Roland Dreier:
      ib: mthca: Always re-arm EQs in mthca_tavor_interrupt()

Roland McGrath:
      Call exit_itimers from do_exit, not __exit_signal
      Yet more posix-cpu-timer fixes

Russell King:
      [ARM] Fix Integrator IM/PD-1 support

Salyzyn, Mark:
      [SCSI] Fix aacraid regression

Stephen Smalley:
      selinux: Fix NULL deref in policydb_destroy

Steven Rostedt:
      [SCSI] scsi_error thread exits in TASK_INTERRUPTIBLE state.

Takashi Iwai:
      ALSA: Fix Oops of suspend/resume with generic drivers

Yan Zheng:
      [IPV6]: Fix refcnt of struct ip6_flowlabel

[PATCH] ext3: Fix warning without quota support (was: Linux 2.6.14)

[Jean Delvare]

Sorry for not spotting this one earlier...

Fix the following warning when ext3 fs is compiled without quota
support:

fs/ext3/super.c: In function `ext3_show_options':
fs/ext3/super.c:516: warning: unused variable `sbi'

Signed-off-by: Jean Delvare <khali@linux-fr.org>

---
 fs/ext3/super.c |    2 ++
 1 file changed, 2 insertions(+)

--- linux-2.6.14.orig/fs/ext3/super.c	2005-10-28 18:25:56.000000000 +0200
+++ linux-2.6.14/fs/ext3/super.c	2005-10-28 18:38:36.000000000 +0200
@@ -513,7 +513,9 @@
 static int ext3_show_options(struct seq_file *seq, struct vfsmount *vfs)
 {
 	struct super_block *sb = vfs->mnt_sb;
+#ifdef CONFIG_QUOTA
 	struct ext3_sb_info *sbi = EXT3_SB(sb);
+#endif
 
 	if (test_opt(sb, DATA_FLAGS) == EXT3_MOUNT_JOURNAL_DATA)
 		seq_puts(seq, ",data=journal");


-- 
Jean Delvare