From: Chuck Lever Date: Tue, 29 Sep 2009 14:38:05 +0000 (-0400) Subject: The user's mount options and the set of versions to try should not X-Git-Tag: nfs-utils-1-2-1-rc6~1 X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=0de3189d32a183f5e91a6d27a9e8f159216d9473;hp=0de3189d32a183f5e91a6d27a9e8f159216d9473 The user's mount options and the set of versions to try should not change over the course of mount retries. With this patch, each version-specific mount attempt is compartment- alized, and starts from the user's original mount options each time. Thus these attempts can now be safely performed in any order, depending on what the user has requested, what the server advertises, and what is up and running at any given point. Don't regress the fix in commit 23c1a452. For v2/v3 negotation, only the user's mount options are written to /etc/mtab, and not any options that were negotiated by mount.nfs. There's no way to guarantee that the server configuration will be the same at umount time as it was at mount time. Signed-off-by: Chuck Lever Signed-off-by: Steve Dickson ---