into ppc970.osdl.org:/home/torvalds/v2.6/linux

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

	Don't label all retries as "server seeing garbage".
	Report correct error for buffer overflows.
	Fix incorrect buffer overflow test that was masking
		AUTH_REJECTEDCRED, AUTH_REJECTEDVERF,... errors.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

 Description:
 Fix an NFS client bug introduced in 2.6.9-rc1.  The "df" command was
 reporting the size of NFS file systems incorrectly.
Signed-off-by: Chuck Lever <cel@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

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

 The behavior enabled by the "noac" mount option should be precisely
 equivalent to setting acreg{min,max} or acdir{min,max} to zero via mount
 options.
Signed-off-by: Chuck Lever <cel@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

 Other parts of the NFS client invoke nfs_wb_all() when they want to flush dirty
 cache pages.  The direct path needs to do that, too.
Signed-off-by: Chuck Lever <cel@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

 The initial implementation of NFS direct reads was entirely synchronous.
 The direct read logic issued one NFS READ operation at a time, and waited
 for the server's reply before issuing the next one.  For large direct
 read requests, this is unnecessarily slow.

 This patch changes the NFS direct read path to dispatch NFS READ operations
 for a single direct read request in parallel and wait for them once.  The
 direct read path is still synchronous in nature, but because the NFS READ
 operations are going in parallel, the completion wait should be much shorter.
Signed-off-by: Chuck Lever <cel@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

 Reduce stack utilization in the NFS direct read path by using a
 dynamically allocated nfs_read_data structure instead of allocating one
 on the stack.  This reduces stack utilization of nfs_direct_read_seg
 from over 900 bytes to less than 100 bytes.
Signed-off-by: Chuck Lever <cel@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

 Reduce stack utilization in the NFS direct write path by using a
 dynamically allocated nfs_write_data structure instead of allocating one
 on the stack.  This reduces stack utilization of nfs_direct_write_seg
 from over 900 bytes to less than 100 bytes.
Signed-off-by: Chuck Lever <cel@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

 Immediately return control to the application if a short NFS write is
 detected in the NFS client's direct write path.  This is better behavior
 than what the direct write path does today, which could result in data
 appearing at the wrong offset in the file.

 Eventually this code path should retry short writes at least once before
 giving up.
Signed-off-by: Chuck Lever <cel@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

 Replace a C macro with sizeof().
Signed-off-by: Chuck Lever <cel@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

 Description:
 Ethereal and other tools display RPC XIDs in host order.  This patch
 changes the RPC trace messages that display XIDs to print them in host
 order so they can be easily matched to XIDs that appear in Ethereal.
Signed-off-by: Chuck Lever <cel@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

 Improve trace debugging messages for NFSv2/3 GETATTR and SETATTR
 procedures.
Signed-off-by: Chuck Lever <cel@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

 Recently a patch set was accepted to allow the Linux NFS client to handle
 short writes by retrying the unwritten portion of the request.  The only
 case that now results in an error is when the server makes no progress;
 that is, writes zero bytes.

 This patch changes the kernel log warning that is generated in that case
 to reflect the error condition more accurately.
Signed-off-by: Chuck Lever <cel@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

 sillyrenames when renaming to an existing file.
Signed-off-by: Greg Banks <gnb@melbourne.sgi.com>
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>

      know there are no pending timers.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

      inodes may be marked as stale in one instance (causing the dentry
      to be dropped) then re-enabled in the next instance.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

Although it usually means that someone has deleted a file on the server,
the ESTALE error may also indicate that the sysadmin has used exportfs to
deny our client access to the server. Most NFS implementations therefore
consider it a non-permanent condition, and allow inodes to "recover" when
the sysadmin re-enables access.
If, however, you want to work with broken servers, like unfsd, that reuse
filehandles for new files after the original file gets deleted, then
"recovery" is impossible, since it may be that the filehandle now points
to a different file. Note that this is broken server behaviour that may
happen even without us ever seeing the ESTALE error.
In order to minimize (but we can never eliminate entirely) this race
condition on unfsd servers, Linux has traditionally made ESTALE a
permanent condition on all filehandles except the root filehandle.

The problem is that if we apply this strict staleness criterion to
directories (particularly so for he current directory), then all
processes will need to re-walk the path starting from the mount point,
in order to recover from the sysadmin intervention case. As this is not
usual on other *NIX implementations, and may in any case be undermined by
caching rules etc, this is being seen as a usability problem.

This patch makes ESTALE a non-permanent condition on directories, but
preserves the current behaviour for non-directories.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

 Replace the kmalloc() and kfree() calls in this path with appropriate
 invocations of nfs_writedata_alloc() and nfs_writedata_free().  This
 makes nfs_writepage_sync match all the other write paths in fs/nfs/write.c.

 Category: Maintainability, performance
Signed-off-by: Chuck Lever <cel@netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

as a void * when we know perfectly well what it is.  And we're passing
some arguments that we don't actually use.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

unwisely revived it for use with the gss code.  Having removed that use
from the gss code, it's time to remove all references to it.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

indicate failure of an upcall to get a gss context for that cred,
set the status of waiting tasks to indicate failure.

This solves problems e.g. with creds with the CRED_DEAD flag set
never being refreshed, which caused krb5 mounts to fail after the
context used to do RENEWS expired.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

the cred containing the context non-uptodate, triggering creation of
a new context.

Note that on the send-side operations (get_mic, wrap), we mark the
cred as not uptodate, but continue trying to use it; the server can
complain if it wants to, and the next time through we'll refresh it.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

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

       credentials when they are available.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

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

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

     calls renders nfs_cached_lookup() obsolete.
Signed-off-by: Trond Myklebust <trond.myklebust@fys.uio.no>

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

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

  People are worrying about spinlock deadlocks in the debugging code, without
  actually worrying about the bugs that triggered the debugging code in the
  first place.
  Convert to BUG_ON() in order to ensure that bugs are reported.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

  Shirly Ma reported seeing problems with rpc_killall_tasks() causing
  the task->tk_magic debugging test to trigger. It turns out we may be
  killing tasks that are not yet running or even initialized.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

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

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

The NFS direct-io error return path for request sizes greater than
MAX_DIRECTIO_SIZE fails to initialize the returned page struct array
pointer to NULL.

Discovered using AKPM's ext3-tools: odwrite -ko 0 16385 foo
Signed-off-by: Bill Rugolsky <brugolsky@telemetry-investments.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Patch from Liam Girdwood

This patch adds a bit definition for the SSP port PSP mode.

Signed-off-by: Liam Girdwood
Signed-off-by: Russell King