Merge git://oss.sgi.com:8090/nathans/xfs-2.6

* git://oss.sgi.com:8090/nathans/xfs-2.6:
  [XFS] Fixup whitespace damage in log_write, remove final warning.
  [XFS] Rework code snippets slightly to remove remaining recent-gcc
  [XFS] Fix realtime subvolume expansion, a porting bug b0rked it.  Coverity
  [XFS] Remove a race condition where a linked inode could BUG_ON in
  [XFS] Remove redundant directory checks from inode link operation.
  [XFS] Remove a couple of no-longer-used macros.
  [XFS] Reduce size of xfs_trans_t structure. * remove ->t_forw, ->t_back --
  [XFS] remove unused behaviour lock - shrink XFS vnode as a side effect.
  [XFS] * There is trivial "inode => vnode => inode" conversion, but only
  [XFS] link(2) on directory is banned in VFS.

diff --combined fs/xfs/xfs_mount.c
index ed7579beb6b06949541af834978eba7dc998f79e,22d3a1c75474b2be7bd9f119f6f24b17c13969aa..4be5c0b2d296b20a1feda5c4f1b47c38685f757b
--- 1/fs/xfs/xfs_mount.c
--- 2/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@@ -1721,14 -1721,15 +1721,14 @@@ xfs_mount_log_sbunit
   * is present to prevent thrashing).
   */
  
 +#ifdef CONFIG_HOTPLUG_CPU
  /*
   * hot-plug CPU notifier support.
   *
 - * We cannot use the hotcpu_register() function because it does
 - * not allow notifier instances. We need a notifier per filesystem
 - * as we need to be able to identify the filesystem to balance
 - * the counters out. This is achieved by having a notifier block
 - * embedded in the xfs_mount_t and doing pointer magic to get the
 - * mount pointer from the notifier block address.
 + * We need a notifier per filesystem as we need to be able to identify
 + * the filesystem to balance the counters out. This is achieved by
 + * having a notifier block embedded in the xfs_mount_t and doing pointer
 + * magic to get the mount pointer from the notifier block address.
   */
  STATIC int
  xfs_icsb_cpu_notify(
@@@ -1778,7 -1779,6 +1778,7 @@@
  
        return NOTIFY_OK;
  }
 +#endif /* CONFIG_HOTPLUG_CPU */
  
  int
  xfs_icsb_init_counters(
@@@ -1791,11 -1791,9 +1791,11 @@@
        if (mp->m_sb_cnts == NULL)
                return -ENOMEM;
  
 +#ifdef CONFIG_HOTPLUG_CPU
        mp->m_icsb_notifier.notifier_call = xfs_icsb_cpu_notify;
        mp->m_icsb_notifier.priority = 0;
 -      register_cpu_notifier(&mp->m_icsb_notifier);
 +      register_hotcpu_notifier(&mp->m_icsb_notifier);
 +#endif /* CONFIG_HOTPLUG_CPU */
  
        for_each_online_cpu(i) {
                cntp = (xfs_icsb_cnts_t *)per_cpu_ptr(mp->m_sb_cnts, i);
@@@ -1814,7 -1812,7 +1814,7 @@@ xfs_icsb_destroy_counters
        xfs_mount_t     *mp)
  {
        if (mp->m_sb_cnts) {
 -              unregister_cpu_notifier(&mp->m_icsb_notifier);
 +              unregister_hotcpu_notifier(&mp->m_icsb_notifier);
                free_percpu(mp->m_sb_cnts);
        }
  }
@@@ -2028,7 -2026,7 +2028,7 @@@ xfs_icsb_balance_counter
        xfs_sb_field_t  field,
        int             flags)
  {
-       uint64_t        count, resid = 0;
+       uint64_t        count, resid;
        int             weight = num_online_cpus();
        int             s;
  
@@@ -2060,6 -2058,7 +2060,7 @@@
                break;
        default:
                BUG();
+               count = resid = 0;      /* quiet, gcc */
                break;
        }