[GIT PULL] Please pull 2 more bugfixes for the NFS client

[Trond Myklebust]

Hi Linus,

Please pull from the "bugfixes" branch of the repository at

   git pull git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git bugfixes

This will update the following files through the appended changesets.

  Cheers,
    Trond

----
 fs/nfs/super.c    |    2 ++
 net/sunrpc/clnt.c |    5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

commit 36dd2fdb37efdab15844eb72026f8ce3aa0fb560
Author: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Date:   Thu Sep 24 14:58:42 2009 -0400

    nfs[23] tcp breakage in mount with binary options
    
    We forget to set nfs_server.protocol in tcp case when old-style binary
    options are passed to mount.  The thing remains zero and never validated
    afterwards.  As the result, we hit BUG in fs/nfs/client.c:588.
    
    Breakage has been introduced in NFS: Add nfs_alloc_parsed_mount_data
    merged yesterday...
    
    Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>

commit 7a73fdde3990ea840b604248362876437ea8ce80
Author: Jaswinder Singh Rajput <jaswinder@xxxxxxxxxx>
Date:   Thu Sep 24 14:58:42 2009 -0400

    net: fix htmldocs sunrpc, clnt.c
    
    
      DOCPROC Documentation/DocBook/networking.xml
      Warning(net/sunrpc/clnt.c:647): No description found for parameter 'req'
      Warning(net/sunrpc/clnt.c:647): No description found for parameter 'tk_ops'
      Warning(net/sunrpc/clnt.c:647): Excess function parameter 'ops' description in 'rpc_run_bc_task'
    
    Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@xxxxxxxxx>
    Cc: Ricardo Labiaga <Ricardo.Labiaga@xxxxxxxxxx>
    Cc: Benny Halevy <bhalevy@xxxxxxxxxxx>
    Cc: Andy Adamson <andros@xxxxxxxxxx>
    Cc: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>
    Cc: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
    Cc: David Miller <davem@xxxxxxxxxxxxx>
    Acked-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
    Acked-by: Benny Halevy <bhalevy@xxxxxxxxxxx>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx>


-- 
Trond Myklebust
Linux NFS client maintainer

NetApp
Trond.Myklebust@xxxxxxxxxx
www.netapp.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/