Skip to contentSkip to conversation

Please pull NFS client bugfixes for 2.6.32-rc3

GIT PULL Trond Myklebust 1 participant 1 message Oct 8, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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/client.c        |    2 +-
 fs/nfs/nfs4namespace.c |   12 ++++++------
 fs/nfs/nfs4renewd.c    |    6 ------
 fs/nfs/super.c         |   36 +++++++++++++++++-------------------
 4 files changed, 24 insertions(+), 32 deletions(-)

commit 3050141bae57984dd660e6861632ccf9b8bca77e

Author: Trond Myklebust <[email protected]>
Date:   Thu Oct 8 11:50:55 2009 -0400

NFSv4: Kill nfs4_renewd_prepare_shutdown()

The NFSv4 renew daemon is shared between all active super blocks that refer to a particular NFS server, so it is wrong to be shutting it down in nfs4_kill_super every time a super block is destroyed.

This patch therefore kills nfs4_renewd_prepare_shutdown altogether, and leaves it up to nfs4_shutdown_client() to also shut down the renew daemon by means of the existing call to nfs4_kill_renewd().

commit 517be09def6cd7bc231222ee756fde8ea245a6fe

Author: Trond Myklebust <[email protected]>
Date:   Tue Oct 6 15:42:20 2009 -0400

NFSv4: Fix the referral mount code

Fix a typo which causes try_location() to use the wrong length argument when calling nfs_parse_server_name(). This again, causes the initialisation of the mount's sockaddr structure to fail.

Also ensure that if nfs4_pathname_string() returns an error, then we pass that error back up the stack instead of ENOENT.

commit f4373bf9e67e4a653c8854acd7b02dac9714c98a

Author: Ben Hutchings <[email protected]>
Date:   Tue Oct 6 15:42:18 2009 -0400

nfs: Avoid overrun when copying client IP address string

As seen in <http://bugs.debian.org/549002>, nfs4_init_client() can overrun the source string when copying the client IP address from nfs_parsed_mount_data::client_address to nfs_client::cl_ipaddr. Since these are both treated as null-terminated strings elsewhere, the copy should be done with strlcpy() not memcpy().

commit bcd2ea17da6a329a7276cde7286d802f009af332

Author: Trond Myklebust <[email protected]>
Date:   Tue Oct 6 15:41:22 2009 -0400

NFS: Fix port initialisation in nfs_remount()

The recent changeset 53a0b9c4c99ab0085a06421f71592722e5b3fd5f (NFS: Replace nfs_parse_ip_address() with rpc_pton()) broke nfs_remount, since the call to rpc_pton() will zero out the port number in data->nfs_server.address.

This is actually due to a bug in nfs_remount: it should be looking at the port number in nfs_server.port instead...

This fixes bug
http://bugzilla.kernel.org/show_bug.cgi?id=14276

commit f5855fecda65c1965c894915ace1e086d4925154

Author: Trond Myklebust <[email protected]>
Date:   Tue Oct 6 15:40:37 2009 -0400

NFS: Fix port and mountport display in /proc/self/mountinfo

Currently, the port and mount port will both display as 65535 if you do not specify a port number. That would be wrong...

commit c5811dbdd26284d63c19fca618bd740dd10ad53d

Author: Trond Myklebust <[email protected]>
Date:   Tue Oct 6 15:40:15 2009 -0400

NFS: Fix a default mount regression...

With the recent spate of changes, the nfs protocol version will now default to 2 instead of 3, while the mount protocol version defaults to 3.

The following patch should ensure the defaults are consistent with the previous defaults of vers=3,proto=tcp,mountvers=3,mountproto=tcp.

This fixes the bug
http://bugzilla.kernel.org/show_bug.cgi?id=14259

Signature · 6 lines
Trond Myklebust
Linux NFS client maintainer

NetApp
[email protected]
www.netapp.com