Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus

diff --cc fs/lockd/clntproc.c
Simple merge

diff --cc fs/nfs/direct.c
Simple merge

diff --cc fs/nfs/inode.c
Simple merge

diff --cc fs/nfs/pagelist.c
Simple merge

diff --cc fs/nfs/read.c
Simple merge

diff --cc fs/nfs/write.c
Simple merge

diff --cc include/linux/sunrpc/sched.h
Simple merge

diff --cc net/sunrpc/sched.c
Simple merge

diff --cc net/sunrpc/xprtsock.c
index 3bb232eb5d905e5d46a5ffb48ed7450eebebcdf3,2fc4a3123261b1b9c37ff3ef122da2d10e817129..49cabffd7fdb87a884a9416b9a46b5848d509506
--- 1/net/sunrpc/xprtsock.c
--- 2/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@@ -1197,8 -1110,9 +1226,9 @@@ static void xs_udp_connect_worker(struc
                dprintk("RPC:      can't create UDP transport socket (%d).\n", -err);
                goto out;
        }
+       xs_reclassify_socket(sock);
  
 -      if (xprt->resvport && xs_bindresvport(xprt, sock) < 0) {
 +      if (xprt->resvport && xs_bindresvport(transport, sock) < 0) {
                sock_release(sock);
                goto out;
        }
@@@ -1282,8 -1195,9 +1312,9 @@@ static void xs_tcp_connect_worker(struc
                        dprintk("RPC:      can't create TCP transport socket (%d).\n", -err);
                        goto out;
                }
+               xs_reclassify_socket(sock);
  
 -              if (xprt->resvport && xs_bindresvport(xprt, sock) < 0) {
 +              if (xprt->resvport && xs_bindresvport(transport, sock) < 0) {
                        sock_release(sock);
                        goto out;
                }