From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 22 Jun 2009 19:55:50 +0000 (-0700)
Subject: Merge branch 'for-2.6.31' of git://fieldses.org/git/linux-nfsd
X-Git-Tag: v2.6.31-rc1~57
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=7e0338c0de18c50f09aea1fbef45110cf7d64a3c

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
  ...
---

7e0338c0de18c50f09aea1fbef45110cf7d64a3c
diff --cc include/linux/sunrpc/svcsock.h
index 6bb1ec4,8271631..04dba23
--- a/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