into kroah.com:/home/greg/linux/BK/gregkh-2.5

Main points:
- receive buffers are decoupled from urbs, so an urb can be
resubmitted with a new buffer before the old buffer is processed.
- the packet reconstruction code is much simpler.
- locking is simplified by the fact that only the tasklet launches
receive urbs

Make the most discriminating comparison first.

The stats field is never NULL.

Always use dev_kfree_skb.

Calculate the maximum size needed for the SAR
reconstruction buffer from the supplied qos parameters.

Should have gone long ago.

Add a vdbg macro for verbose debugging, and convert some
noisy debugging statements to use it.

Replace spin_lock_irqsave/spin_unlock_irqrestore with
spin_lock_irq/spin_unlock_irq in tasklet actions, since
these are always called with local irqs enabled.

Replace spin_lock_irqsave/spin_unlock_irqrestore with
spin_lock_irq/spin_unlock_irq in routines that are only
called in process context.

Defend against future maintainers.

Use set_current_state (TASK_RUNNING); schedule(); instead.

No real code changes.

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

Trivial bugfix: opening a file that doesn't have ->direct_IO() with
O_DIRECT passed in flags fails (as it should) but doesn't call
->release() even though ->open() had been successful.

IOW, we have a leak there - e.g.  open() of a tty with O_DIRECT will
leak a reference to tty and tty_driver.  Besides, quite a few drivers
are _not_ happy with struct file being freed without ->release() after
->open() has returned 0.

According to Jan Derfinak, Olympus USB cameras mistakenly report an
'USBU' signature instead of 'USBS', while using the normal USB Storage
protocol.

The attached patches (again by Jan) fix this problem in 2.4 and 2.5.

This converts /proc/pid/maps to use of seq_file, cleans the issues with
d_path() overflows as a side effect.

It's incremental to seq_path() patch.

This adds a new seq_...() helper:

   seq_path(seq_file, mnt, dentry, escape)

It spits the pathname into seq_file, does octal escapes for given set of
characters, returns the number of characters it'd produced or -1 in case
of error.  Long names are handled gracefully - you don't need anything
to do, generic seq_file logics will do the right thing.

/proc/mounts and /proc/swaps are converted to use of seq_path(), some
junk removed.

/proc/pid/maps will be converted next.

into kernel.bkbits.net:/home/davem/net-2.5

Most cache-lookups to find export information will cause
an upcall, but currently the lookup to find the pseudo root
for nfsv4 wont asthe  cache-handle isn't made available.
This patch makes it available and makes sure that if the
upcall is made, the request is dropped (for now).

From: "William A.(Andy) Adamson" <andros@citi.umich.edu>


this open share state patch creates all the structures and hash tables needed
to create and destroy share state on OPEN.

a struct nfs4_stateowner is introduced. this is currently only used for share
state, but will also be used as an anchor for byte-range lock state. e.g. it
will be either an (open)stateowner or a (lock)stateower.

a struct nfs4_stateid is introduced with holds stateid info for openfiles per
(open)stateowner. this struct will also hold byte-range lock info for
(lock)stateowners.

ownerstr_hashtbl[] holds nfs4_stateowners hashed by the nfs4_open owner and
clientid, and is used to lookup nfs4_stateowners on OPEN.

a struct nfs4_file is introduced which holds info on open files with state.

file_hashtbl[] holds nfs4_files, and is used to find a file in order to search
for conflicting share locks on OPEN. delegation info will hang off the
nf4_file struct.

i moved nfsd4_process_open1() into nfs4state.c, and added nfs4_process_open2()
there as well

i've left lease management, state reclaim, and the special replay management
on sequenceid mutating operations like OPEN for subsequent patches.

From: "William A.(Andy) Adamson" <andros@citi.umich.edu>

this is the first of several patches against 2.5 concerning NFSv4 state for
nfsd. it cleans up the names of state structures in preperation for future
share, lease, byte-range, and delegation patches. specifically, it

1) renames portions of the stateid_t and moves it along with the clientid_t
from xdr.h into state.h

2) uses xdr_netobj to gather related data and length fields in struct
nfs4_open (in xdr4.h) (e.g. we have op_fname.data and op_fname.len
instead of op_name and op_namelen).

3) renames NFSD4_CLIENT_MAXNAME to NFS4_OPAQUE_LIMIT which will be used in
other state fields (not just for name length)

The check for "write was incomplete" is not atomic with the actual write,
so a second write could slip in after a partial write to a tcp socket
and this will cause problems.

So we move the locking out a bit, and test if the socket has
been deleted (SK_DEAD) between getting the lock and trying
to send.

SOCK_NOSPACE is set, so we must set it when we want to get
a ->write_space callback.

From: Hirokazu Takahashi <taka@valinux.co.jp>

sock_wspace() is used to see how much can be written to a udp socket,
but tcp_wspace must be used on a tcp socket.
This patch informs sunrpc/svcsock.c of this subtlety.

I noticed that the Nagle algorithm was disabled just recently on the
client side, while it still seems to be enabled on the server side. The
previous patch came from Chuck Lever.

Below patch disables it on the server side as well. For latency reasons,
this should be the desired behaviour NFS at both client and server.

Below patch resolves a hang where a TCP nfsd connection will hang even
though new data is received on the socket. We've seen this a few times in
our lab, but it usually happened every few weeks.

If a short record header is received, the SK_BUSY flag is never cleared,
and even though new data arrives, it will not be handled. This in turn
leads to hangs of particular clients (while others will continue to work
without problem).

I also changed the return code for that condition to be the same as for a
(regular) short read.