- Change fs/ntfs/dir.c::ntfs_reddir() to only read/write ->f_pos once
  at entry/exit respectively.
- Use C99 initializers for structures.
- Remove unused variable blocks from fs/ntfs/aops.c::ntfs_read_block().

The patch below consolidates some duplicate code, reduces some
indentation, and adds a freeing of a page in mem_read() that could be left
unfreed, as far as I can see.

into home.transmeta.com:/home/torvalds/v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux

make cpqarray and cciss use these

Heading Rusty off at the pass...

This also changes and array initialiser...

get_spare recently became static and no-one told md_k.h

Sync_sbs tries to access the ->sb for the first rdev of an mddev.
This can oops as the wrong arg is given to list_entry, and also
if a define was faound to be failed, as failed devices have their ->sb
removed.  But that removal isn't necessary, so now an rdev will always
have an ->sb.

Define container_of which cast from member to struct with some type checking.

This is much like list_entry but is cearly for things other than lists.

List_entry now uses container_of.

into home.transmeta.com:/home/torvalds/v2.5/linux

Dawson Engler's Stanford Checker reported this missing unlock to
LKML 11 July (amongst "56 potential lock/unlock bugs in 2.5.8").

Found by Simon Trimmer <simon@veritas.com>: shmem_file_write
failure path duplicates kunmap, causing oops holding kmap_lock.

Trivial: vfs_link in 2.5 checks S_ISDIR first, shmem_link
need not repeat it, but test crept back in at some stage.

Martin Schwidefsky <schwidefsky@de.ibm.com> reported "Bug with shared
memory" to LKML 14 May: hang due to schedule in truncate_list_pages
called from .... shm_destroy holding shm_lock spinlock.  shm_destroy
needs that lock for shm_rmid, but it can be safely unlocked once link
from id to shp has been removed.

Here is a quick fix.  I would like to synchronize with the irq handler
changes as well.  Becouse right now I know that preemption is killing
the disk subsystem when moving data between disks using different
request queues...  In esp.  It get's me in to do_request() with a queue
in unplugged state.  (Not everything is my fault, after all :-).

into kleikamp.austin.ibm.com:/home/shaggy/bk/jfs-2.5

 - init thread needs to have preempt_count of 1 until sched_init().
   (William Lee Irwin III)
 - clean up the irq-mask macros. (Linus)
 - add barrier() to irq_enter() and irq_exit(). (based on Oleg Nesterov's
   comment.)
 - move the irqs-off check into preempt_schedule() and remove
   CONFIG_DEBUG_IRQ_SCHEDULE.
 - remove spin_unlock_no_resched() and comment the affected places more
   agressively.
 - slab.c needs to spin_unlock_no_resched(), instead of spin_unlock(). (It
   also has to check for preemption in the right spot.) This should fix
   the memory corruption.
 - irq_exit() needs to run softirqs if interrupts not active - in the
   previous patch it ran them when preempt_count() was 0, which is
   incorrect.
 - spinlock macros are updated to enable preemption after enabling
   interrupts. Besides avoiding false positive warnings, this also
 - fork.c has to call scheduler_tick() with preemption disabled -
   otherwise scheduler_tick()'s spin_unlock can preempt!
 - irqs_disabled() macro introduced.
 - [ all other local_irq_enable() or sti instances conditional on
     CONFIG_DEBUG_IRQ_SCHEDULE are to fix false positive warnings. ]
 - fix buggy in_softirq(). Fortunately the bug made the test broader,
   which didnt result in algorithmical breakage, just suboptimal
   performance.
 - move do_softirq() processing into irq_exit() => this also fixes the
   softirq processing bugs present in apic.c IRQ handlers that did not
   test for softirqs after irq_exit().
 - simplify local_bh_enable().

into maxwell.earthlink.net:/usr/src/linus-2.5

Amiga Zorro bus updates
 - Bring APUS Zorro bus announcement in sync with the m68k version
 - Fix typo in Zorro device generator name
 - Kill duplicate ] in Zorro device ID database
 - Include <asm/io.h> instead of duplicating definitions from <asm/io.h>

console.wait_key was removed

M68k VT updates:
  - Include <linux/vt_kern.h> instead of copying the kd_mksound() prototype
  - Lots of stuff depends on CONFIG_VT:
      o SYSRQ_KEY
      o kd_mksound()
      o mach_keyb_init()
      o mach_kbdrate()
      o mach_kbd_leds()
      o mach_kbd_translate()
      o mach_sysrq_xlate()
      o Atari keyboard and joystick drivers
  - There's no need to provide dummy routines for kbd{rate,_leds}()
  - dummy_con depends on CONFIG_DUMMY_CONSOLE

MVME serial driver updates (from 2.4.x)
  - Add missing save of interrupt state
  - _tty_name() got renamed to tty_name()
  - Add devfs support
  - Simplify baud logic
  - Add missing MOD_DEC_USE_COUNT
  - Add missing cli()
  - block_til_ready() got renamed to gs_block_til_ready()

MVME SCSI updates
 - Fix return type in prototype of ncr53c7xx_init()

M68k fault handling updates
  - Fix incorrect page alignment
  - Merge related inline asm statements to avoid .chip confusion
  - Add Sun-3 bus mapping test code
  - Kill warning

M68k TLB updates

M68k task and thread updates

Add new syscalls to m68k
  - Add syscall entries for sys_pivot_root, extended attributes, and futex
  - Fix formatting

Sun-3/3x frame buffer device updates
  - Fix breakage from recent fbdev changes
  - Add support for CG3 graphics on Sun-3/3x

Atari STRAM fixes
  - Add missing include
  - Fix parameter passing to atari_stram_reserve_pages()

Spelling fix

SCSI scatterlist updates for m68k
  - Fix printk() format
  - Update for page/offset in scatterlist