From: Steve Lord <lord@sgi.com>
Message-Id: <200110251921.f9PJL9Y12773@jen.americas.sgi.com>
Date: Thu, 25 Oct 2001 14:21:09 -0500
Subject: TAKE - merge up to 2.4.13
Sender: owner-linux-xfs@oss.sgi.com
Precedence: bulk

This is a combination of merging up to 2.4.13 and cleaning up some
mismatched rcs ids which had crept into the tree. It also makes the
block device cache and the xfs metadata cache coherent - well almost
coherent. The xfs super block and the log are written from special
purpose buffers which are not part of the regular cache. 

Since unmount flushes and removes all cached data, the only time the
inconsistency shows up is if you look at the block device while the
fs is mounted. A consequence of this is that regression test number 17
in the test suite will now fail - since it does precisely this.

I hope to fix the super block one at least at some point, this will
make xfs_db on a running fs more useful, but the log may never be
fully coherent with the block device interface...

Steve

Date:  Thu Oct 25 12:19:10 PDT 2001
Workarea:  jen.americas.sgi.com:/src/lord/xfs-merge

The following file(s) were checked into:
  bonnie.engr.sgi.com:/isms/slinx/2.4.x-xfs


Modid:  2.4.x-xfs:slinx:105458a
linux/net/ipv6/tcp_ipv6.c - 1.29
linux/net/ipv6/af_inet6.c - 1.19
linux/net/ipv4/udp.c - 1.27
linux/net/ipv4/syncookies.c - 1.12
linux/net/ipv4/route.c - 1.28
linux/net/ipv4/ipip.c - 1.20
linux/net/ipv4/ipconfig.c - 1.20
linux/net/ipv4/ip_output.c - 1.29
linux/net/bridge/br.c - 1.20
linux/mm/vmscan.c - 1.83
linux/mm/swap.c - 1.16
linux/mm/page_alloc.c - 1.62
linux/kernel/exit.c - 1.31
linux/include/linux/swap.h - 1.45
linux/include/linux/slab.h - 1.19
linux/include/linux/mm.h - 1.68
linux/include/linux/locks.h - 1.7
linux/include/linux/fs.h - 1.129
linux/include/asm-sparc64/types.h - 1.6
linux/include/asm-sparc64/scatterlist.h - 1.6
linux/include/asm-sparc/scatterlist.h - 1.7
linux/fs/ntfs/fs.c - 1.33
linux/fs/buffer.c - 1.90
linux/drivers/video/leofb.c - 1.10
linux/drivers/video/creatorfb.c - 1.13
linux/drivers/video/cgsixfb.c - 1.12
linux/drivers/sbus/char/zs.c - 1.19
linux/drivers/sbus/char/su.c - 1.19
linux/drivers/sbus/char/sab82532.c - 1.23
linux/drivers/sbus/audio/amd7930.c - 1.10
linux/drivers/net/sunhme.c - 1.32
linux/arch/sparc64/kernel/rtrap.S - 1.10
linux/arch/sparc64/kernel/head.S - 1.13
linux/arch/sparc64/kernel/dtlb_base.S - 1.12
linux/arch/i386/kernel/smp.c - 1.36
linux/Makefile - 1.144
linux/MAINTAINERS - 1.79
linux/drivers/sbus/char/aurora.c - 1.14
linux/arch/sparc64/kernel/pci_sabre.c - 1.26
linux/arch/sparc64/kernel/pci_psycho.c - 1.23
linux/arch/sparc64/kernel/pci_iommu.c - 1.13
linux/arch/sh/mm/init.c - 1.17
linux/arch/sh/mm/fault.c - 1.18
linux/arch/sh/lib/memset.S - 1.3
linux/arch/sh/lib/memmove.S - 1.3
linux/arch/sh/lib/memcpy.S - 1.3
linux/arch/sh/kernel/ptrace.c - 1.12
linux/arch/sh/kernel/process.c - 1.16
linux/include/asm-sh/uaccess.h - 1.11
linux/include/asm-sh/namei.h - 1.4
linux/mm/highmem.c - 1.27
linux/arch/sh/lib/memchr.S - 1.2
linux/arch/sparc64/kernel/sbus.c - 1.13
linux/arch/sparc64/kernel/iommu_common.h - 1.4
linux/arch/sparc64/kernel/iommu_common.c - 1.7
linux/arch/sh/kernel/io_se.c - 1.5
linux/arch/sh/kernel/io_generic.c - 1.5
linux/fs/xfs/linux/xfs_super.c - 1.143
linux/include/linux/page_buf.h - 1.99
linux/kdb/modules/kdbm_pg.c - 1.41
linux/fs/pagebuf/page_buf_locking.c - 1.15
linux/drivers/mtd/Config.in - 1.9
linux/arch/sh/kernel/io_hd64461.c - 1.4
linux/kdb/ChangeLog - 1.9
linux/drivers/sound/ymfpci.c - 1.12
linux/arch/sparc64/kernel/pci_schizo.c - 1.11
linux/arch/cris/Makefile - 1.8
linux/arch/cris/drivers/ethernet.c - 1.7
linux/arch/cris/drivers/serial.c - 1.8
linux/arch/cris/kernel/Makefile - 1.7
linux/arch/cris/kernel/entry.S - 1.9
linux/arch/cris/kernel/head.S - 1.8
linux/arch/cris/kernel/process.c - 1.9
linux/arch/cris/kernel/setup.c - 1.8
linux/arch/cris/lib/checksum.S - 1.6
linux/arch/cris/lib/checksumcopy.S - 1.7
linux/arch/cris/boot/rescue/head.S - 1.4
linux/arch/cris/boot/rescue/kimagerescue.S - 1.4
linux/arch/cris/boot/rescue/testrescue.S - 1.4
linux/arch/cris/drivers/usb-host.c - 1.8
linux/arch/cris/lib/dram_init.S - 1.6
linux/arch/cris/drivers/parport.c - 1.6
linux/drivers/mtd/chips/Makefile - 1.4
linux/arch/cris/drivers/lpslave/bintocarr.pl - 1.4
linux/drivers/scsi/dpt_i2o.c - 1.5
linux/arch/sh/mm/cache-sh3.c - 1.3
linux/arch/sh/mm/cache-sh4.c - 1.3
linux/drivers/message/i2o/i2o_scsi.c - 1.3
linux/drivers/message/i2o/i2o_proc.c - 1.2
linux/drivers/message/i2o/i2o_pci.c - 1.3
linux/drivers/message/i2o/i2o_lan.c - 1.2
linux/drivers/message/i2o/i2o_core.c - 1.3
linux/drivers/message/i2o/i2o_config.c - 1.2
linux/drivers/message/i2o/i2o_block.c - 1.2