On 08/06/2011 06:11 AM, Luk Claes wrote:
> If NFS port (2049) is supplied explicitly, don't ignore this setting by requesting it to portmapper again. Thanks to Ben Hutchings <ben@xxxxxxxxxxxxxxx> for the patch.
>
> Signed-off-by: Luk Claes <luk@xxxxxxxxxx>
Committed....
steved.
> ---
> utils/mount/stropts.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
> index f1aa503..8b2799c 100644
> --- a/utils/mount/stropts.c
> +++ b/utils/mount/stropts.c
> @@ -437,8 +437,8 @@ static int nfs_construct_new_options(struct mount_options *options,
> if (po_append(options, new_option) == PO_FAILED)
> return 0;
>
> - po_remove_all(options, "port");
> - if (nfs_pmap->pm_port != NFS_PORT) {
> + if(po_remove_all(options, "port") == PO_FOUND ||
> + nfs_pmap->pm_port != NFS_PORT) {
> snprintf(new_option, sizeof(new_option) - 1,
> "port=%lu", nfs_pmap->pm_port);
> if (po_append(options, new_option) == PO_FAILED)
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
