Merge branch 'for-2.6.31' of git://fieldses.org/git/linux-nfsd

* 'for-2.6.31' of git://fieldses.org/git/linux-nfsd: (60 commits)
  SUNRPC: Fix the TCP server's send buffer accounting
  nfsd41: Backchannel: minorversion support for the back channel
  nfsd41: Backchannel: cleanup nfs4.0 callback encode routines
  nfsd41: Remove ip address collision detection case
  nfsd: optimise the starting of zero threads when none are running.
  nfsd: don't take nfsd_mutex twice when setting number of threads.
  nfsd41: sanity check client drc maxreqs
  nfsd41: move channel attributes from nfsd4_session to a nfsd4_channel_attr struct
  NFS: kill off complicated macro 'PROC'
  sunrpc: potential memory leak in function rdma_read_xdr
  nfsd: minor nfsd_vfs_write cleanup
  nfsd: Pull write-gathering code out of nfsd_vfs_write
  nfsd: track last inode only in use_wgather case
  sunrpc: align cache_clean work's timer
  nfsd: Use write gathering only with NFSv2
  NFSv4: kill off complicated macro 'PROC'
  NFSv4: do exact check about attribute specified
  knfsd: remove unreported filehandle stats counters
  knfsd: fix reply cache memory corruption
  knfsd: reply cache cleanups
  ...

diff --cc fs/Kconfig
Simple merge

diff --cc fs/nfs/Kconfig
Simple merge

diff --cc fs/nfsd/export.c
Simple merge

diff --cc fs/nfsd/vfs.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc include/linux/nfsd/state.h
Simple merge

diff --cc include/linux/sunrpc/svcsock.h
index 6bb1ec4ae3108dc963d597658b7332f0c0854aa9,8271631389491c690be8f01596bf0ce484833dfd..04dba23c59f2c4aead01ab313127368a63b93a05
--- 1/include/linux/sunrpc/svcsock.h
--- 2/include/linux/sunrpc/svcsock.h
+++ b/include/linux/sunrpc/svcsock.h
@@@ -38,12 -38,13 +38,15 @@@ int                svc_recv(struct svc_rqst *, long)
  int           svc_send(struct svc_rqst *);
  void          svc_drop(struct svc_rqst *);
  void          svc_sock_update_bufs(struct svc_serv *serv);
- int           svc_sock_names(char *buf, struct svc_serv *serv, char *toclose);
- int           svc_addsock(struct svc_serv *serv, int fd, char *name_return);
+ int           svc_sock_names(struct svc_serv *serv, char *buf,
+                                       const size_t buflen,
+                                       const char *toclose);
+ int           svc_addsock(struct svc_serv *serv, const int fd,
+                                       char *name_return, const size_t len);
  void          svc_init_xprt_sock(void);
  void          svc_cleanup_xprt_sock(void);
 +struct svc_xprt *svc_sock_create(struct svc_serv *serv, int prot);
 +void          svc_sock_destroy(struct svc_xprt *);
  
  /*
   * svc_makesock socket characteristics

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