Date:  Fri Sep 13 11:30:31 PDT 2002
Workarea:  jen.americas.sgi.com:/src/lord/xfs-merge.2.5
Author:  lord
Merged by:  lord
Merged mods:  2.4.x-xfs:slinx:127368a

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


Modid:  2.5.x-xfs:slinx:127368a
linux/fs/xfs/xfs_vnodeops.c - 1.564
	- Merge of 2.4.x-xfs:slinx:127368a by lord.

Date:  Fri Sep 13 07:05:57 PDT 2002
Workarea:  dhcp212.munich.sgi.com:/home/hch/repo/ptools/linux-2.5-xfs
Author:  hch
Merged by:  hch
Merged mods:  2.4.x-xfs:slinx:127349a

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


Modid:  2.5.x-xfs:slinx:127349a
linux/fs/xfs/pagebuf/page_buf.c - 1.59
	- Merge of 2.4.x-xfs:slinx:127349a by hch.
	  Return -ENOMEM on vmap failure in _pagebuf_lookup_pages

Date:  Fri Sep 13 06:24:23 PDT 2002
Workarea:  dhcp212.munich.sgi.com:/home/hch/repo/ptools/linux-2.5-xfs
Author:  hch
Merged by:  hch
Merged mods:  2.4.x-xfs:slinx:127345a

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


Modid:  2.5.x-xfs:slinx:127345a
linux/fs/xfs/pagebuf/page_buf_locking.c - 1.28
linux/fs/xfs/pagebuf/page_buf.c - 1.58
	- Merge of 2.4.x-xfs:slinx:127345a by hch.
	  Fix up comments:  Pagebuf is only used for metadata nowdays

Date:  Thu Sep 12 20:10:49 PDT 2002
Workarea:  snort.melbourne.sgi.com:/home/nathans/2.5.x-xfs
Author:  nathans
Merged by:  nathans
Merged mods:  2.4.x-xfs:slinx:127321a

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


Modid:  2.5.x-xfs:slinx:127321a
linux/fs/xfs/linux/xfs_super.c - 1.227
	- Merge of 2.4.x-xfs:slinx:127321a by nathans.
	  tidy up code consistency - same argument formatting throughout and make
	  consistent use of STATIC.

Date:  Wed Sep 11 12:12:31 PDT 2002
Workarea:  stout.americas.sgi.com:/localhome/src/sandeen/2.5.x-xfs/workarea
Merged by:  sandeen
Merged mods:  
2.4.x-xfs:slinx:127120a
2.4.x-xfs:slinx:127147a
Author:  sandeen

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


Modid:  2.5.x-xfs:slinx:127150a
linux/fs/xfs/linux/xfs_iops.c - 1.180
	- Merge of 2.4.x-xfs:slinx:127120a originally by sandeen on 09/11/02

linux/fs/xfs/linux/xfs_aops.c - 1.4
	- Merge of 2.4.x-xfs:slinx:127147a originally by sandeen on 09/11/02
	  add error checks to linvfs_direct_IO

Date:  Tue Sep 10 14:07:19 PDT 2002
Workarea:  jen.americas.sgi.com:/src/lord/xfs-merge.2.5
Author:  sandeen
Merged by:  lord
Merged mods:  2.4.x-xfs:slinx:127049a

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


Modid:  2.5.x-xfs:slinx:127049a
linux/fs/xfs/linux/xfs_iops.c - 1.179
	- Merge of 2.4.x-xfs:slinx:127049a by lord.

Date:  Tue Sep 10 09:56:09 PDT 2002
Workarea:  jen.americas.sgi.com:/src/lord/xfs-merge.2.5
Author:  sandeen
Merged by:  lord
Merged mods:  2.4.x-xfs:slinx:127029a

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


Modid:  2.5.x-xfs:slinx:127029a
linux/fs/xfs/support/debug.c - 1.9
	- Merge of 2.4.x-xfs:slinx:127029a by lord.

into dhcp212.munich.sgi.com:/home/hch/repo/bk/linux-2.5-xfs

This adds support for synchronous iocbs and converts generic_file_read
to use a sync iocb to call into generic_file_aio_read.

The tests I've run with lmbench on a piii-866 showed no difference in
file re-read speed when forced to use a completion path via aio_complete
and an -EIOCBQUEUED return from generic_file_aio_read -- people with
slower machines might want to test this to see if we can tune it any
better.  Also, a bug fix to correct a missing call into the aio code
from the fork code is present.  This patch sets things up for making
generic_file_aio_read actually asynchronous.

This is Janet Morgan's patch which converts the readv/writev code
to submit all segments for IO before waiting on them, rather than
submitting each segment separately.

This is a critical performance fix for O_DIRECT reads and writes.
Prior to this change, O_DIRECT vectored IO was forced to wait for
completion against each segment of the iovec rather than submitting all
segments and waiting on the lot.  ie: for ten segments, this code will
be ten times faster.

There will also be moderate improvements for buffered IO - smaller code
paths, plus writev() only takes i_sem once.

The patch ended up quite large unfortunately - turned out that the only
sane way to implement this without duplicating significant amounts of
code (the generic_file_write() bounds checking, all the O_DIRECT
handling, etc) was to redo generic_file_read() and generic_file_write()
to take an iovec/nr_segs pair rather than `buf, count'.

New exported functions generic_file_readv() and generic_file_writev()
have been added:

ssize_t generic_file_readv(struct file *filp, const struct iovec *iov,
                          unsigned long nr_segs, loff_t *ppos);
ssize_t generic_file_writev(struct file *file, const struct iovec *iov,
                          unsigned long nr_segs, loff_t * ppos);

If a driver does not use these in their file_operations then they will
continue to use the old readv/writev code, which sits in a loop calling
calls fops->read() or fops->write().

ext2, ext3, JFS and the blockdev driver are currently using this
capability.

Some coding cleanups were made in fs/read_write.c.  Mainly:

- pass "READ" or "WRITE" around to indicate the diretion of the
  operation, rather than the (confusing, inverted)
  VERIFY_READ/VERIFY_WRITE.

- Use the identifier `nr_segs' everywhere to indicate the iovec
  length rather than `count', which is often used to indicate the
  number of bytes in the syscall.  It was confusing the heck out of me.

- Some cleanups to the raw driver.

- Some additional generality in fs/direct_io.c: the core `struct dio'
  used to be a "populate-and-go" thing.  Janet has broken that up so
  you can initialise a struct dio once, then loop around feeding it
  more file segments, then wait on completion against everything.

- In a couple of places we needed to handle the situation where we
  knew, a-priori, that the user was going to get a short read or write.
  File size limit exceeded, read past i_size, etc.  We handled that by
  shortening the iovec in-place with iov_shorten().  Which is not
  particularly pretty, but neither were the alternatives.

This makes NMIs work - otherwise they go to CPU 0 only and any hard
lockup on the other CPUs will not be detected by the nmi_watchdog.

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

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

into nuts.ninka.net:/home/davem/src/BK/net-2.5

into nuts.ninka.net:/home/davem/src/BK/llc-2.5

Intermediate patch for the PF_LLC SOCK_DGRAM prim clean-up, now
PF_LLC is prims in the sending side, now to hack the core to
not use prims to send to PF_LLC.

This also fixes a skb leak on llc_sap_state_process.

into nuts.ninka.net:/home/davem/src/BK/sparc-2.5

- Jens needs to seperate out the IN/OUT macros to seperate what accesses
are to the IDE_DATA register and the rest.  On big-endian platforms
the IDE_DATA register should be accessed in big-endian for it to all
work out correctly or at least be compatible with the behavior existing
before the IDE platform macro interface changes in 2.5.x

This implements the 'keep the initial thread around until every thread
in the group exits' concept in a different, less intrusive way, along
your suggestions.  There is no exit_done completion handling anymore,
freeing of the task is still done by wait4().  This has the following
side-effect: detached threads/processes can only be started within a
thread group, not in a standalone way.

(This also fixes the bugs introduced by the ->exit_done code, which made
it possible for a zombie task to be reactivated.)

I've introduced the p->group_leader pointer, which can/will be used for
other purposes in the future as well - since from now on the thread
group leader is always existent.  Right now it's used to notify the
parent of the thread group leader from the last non-leader thread that
exits [if the thread group leader is a zombie already].

I distilled the attached fix-patch from Daniel's bigger patch - it
includes all fixes for all currently known ptrace related breakages,
which include things like bad behavior (crash) if the tracer process
dies unexpectedly.

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