This accidently made it into my upstream tree and is not meant
to go upstream.
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>

into plexity.net:/home/dsaxena/src/linux-2.6-for-rmk

This changeset fixes up all the IXP2000 issues mentioned in the following message:

http://lists.arm.linux.org.uk/pipermail/linux-arm-kernel/2004-August/024156.html

- Remove page table fixups for IXP2400 systems.  There is actually some
  confusion b/w myself and Intel on what mappings really needs this and
  we still need to determine a proper clean way to do this. When we have
  that, we'll add support back in. For now I am still able to boot 
  on IXP2400 systems.

- Replaced __asm__ __volatile__("":::"memory") with barrier()

- Remove inclusion of mach-types.h in ixdp2x01.h. The machine_is_ixdp2x01()
  macro was only being used in one place, so just check for 
  (machine_is_ixdp2401() || machine_is_ixdp2801())
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>

I found a problem in the implementation of io.h for the ixp425.
It wasn't letting me access memory at VMALLOC_START, only after it.
I've included a patch to fix this problem.  This patch is for the
2.4.x kernel, but it looks like it needs fixing in the 2.6.x kernel as
well.
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>

into plexity.net:/home/dsaxena/src/linux-2.6-for-rmk

into plexity.net:/home/dsaxena/src/linux-2.5-bk

The code doesn't actually _care_ about 32/64-bit issues,
only about F_SETLK vs F_SETLKW, and the F_SETLK64 doesn't
exist except as a compatibility thing on 64-bit architectures
(since the regular one already _is_ 64-bit, of course).

into fys.uio.no:/home/linux/bitkeeper/nfsclient-2.6

   server are not allowed to be interrupted as that may result in the
   client and server disagreeing.

   recall ability.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

   NFS4ERR_CB_PATH_DOWN error.

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

into fys.uio.no:/home/linux/bitkeeper/work/nfsclient-2.6

into fys.uio.no:/home/linux/bitkeeper/nfsclient-2.6

   rather than an inode argument. Fix up nfs_instantiate() and
   _nfs4_do_open to use this since doing a new lookup might be racy.

   NFS4ERR_DELAY on the GETATTR call.

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

   that hangs off filp->private_data. As a side effect, this also
   cleans up the NFSv4 private file state info.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

   operations by using a per-server read/write semaphore.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

   NFS4ERR_DELAY properly.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

into fys.uio.no:/home/linux/bitkeeper/nfsclient-2.6

   call allows for the client to request that the mtime and/or atime
   of an inode be set to the current server time, the given (client)
   time, or not changed.  The set-to-current-server value is used
   when you run "touch file" on the client.

The NFSv2 RFC defines no such encoding for the sattr structure. 
   However Solaris and Irix machine obey a convention where passing
   the invalid value mtime.useconds=1000000 means "set both mtime and
   atime to the current server time".  The convention is documented
   in the book "NFS Illustrated" by Brent Callaghan.  The patch below
   implements this convention for the Linux client and server (hence
   multiple To:s).
Signed-off-by: Greg Banks <gnb@sgi.com>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

   listed as "the newer version ... of the NFS protocol". Obviously
   both can't be the newer version at the same time, so here's a
   patch to correct the text in such a way that only v4 is listed as
   the newer version. Patch is against 2.6.7-rc3 - please consider
   including it.
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

   file handle container, there is no longer any need to clear the
   file handle container before copying in a file handle.  This
   allows us to remove a 128 byte memset() from several hot paths.
Signed-off-by: Chuck Lever <cel@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

   store 128 bytes, usually NFS servers don't use file handles that
   are more than 32 bytes in size.  This patch creates an efficient
   mechanism for comparing file handles that ignores the unused bytes
   in a file handle.
Signed-off-by: Chuck Lever <cel@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

   direct I/O support for NFS files.  The 2.4 VFS O_DIRECT logic was
   block based, thus the NFS client had to provide a minimum
   allowable blocksize for O_DIRECT reads and writes on NFS files. 
   For various reasons we chose 512 bytes. In 2.6, there is no
   requirement for a minimum blocksize.  NFS O_DIRECT reads and
   writes can go to any byte at any offset in a file.  Thus we revert
   the blocksize setting for NFS file systems to the previous
   behavior, which was to advertise the "wsize" setting as the
   optimal I/O block size.  This improves the performance of
   applications like 'cp' which use this value as their transfer
   size.

This patch also exposes the server's reported disk block size in the
   f_frsize of the vfsstat structure.
Signed-off-by: Chuck Lever <cel@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

   request. Get rid of nfs_put_super.
Signed-off-by: Chuck Lever <cel@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

   a heavy read and write workload on one mount point from
   interfering with workloads on other mount points.

Note that there is still some serialization due to the big kernel
   lock.
Signed-off-by: Chuck Lever <cel@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: Andy Adamson <andros@citi.umich.edu>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>