Attachment 197391 Details for Bug 171712 – updated patch -- add the option back, but correct it

[patch] updated patch -- add the option back, but correct it

0005-BZ-171712-remove-redundant-and-incorrect-protocol-f.patch (text/plain), 1.49 KB, created by Jeff Layton on 2007-09-17 13:11:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2007-09-17 13:11:57 UTC

Size: 1.49 KB

patch

obsolete

>From 0cf618331ac286ac66f3ea96f15cd9a13bae3fdf Mon Sep 17 00:00:00 2001
>From: Jeff Layton <jlayton@redhat.com>
>Date: Thu, 13 Sep 2007 14:19:38 -0400
>Subject: [PATCH] BZ#171712: remove redundant and incorrect protocol for NFS in /proc/mounts
>
>We already have the patch that adds "proto=blah" to /proc/mounts based on
>the actual transport used for the mount. Remove the option which is based
>upon the option flag since NFSv4 doesn't set it correctly anyway. Add an
>extra ,%s to the string in so that programs looking for that option will
>still see it.
>---
> fs/nfs/inode.c |    3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
>diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
>index ff162df..b14661e 100644
>--- a/fs/nfs/inode.c
>+++ b/fs/nfs/inode.c
>@@ -562,7 +562,6 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss,
> 		{ NFS_MOUNT_SOFT, ",soft", ",hard" },
> 		{ NFS_MOUNT_INTR, ",intr", "" },
> 		{ NFS_MOUNT_POSIX, ",posix", "" },
>-		{ NFS_MOUNT_TCP, ",tcp", ",udp" },
> 		{ NFS_MOUNT_NOCTO, ",nocto", "" },
> 		{ NFS_MOUNT_NOAC, ",noac", "" },
> 		{ NFS_MOUNT_NONLM, ",nolock", ",lock" },
>@@ -603,7 +602,7 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss,
> 			snprintf(buf, sizeof(buf), "%u", nfss->client->cl_xprt->prot);
> 			proto = buf;
> 	}
>-	seq_printf(m, ",proto=%s", proto);
>+	seq_printf(m, ",proto=%s,%s", proto, proto);
> 	seq_printf(m, ",timeo=%lu", 10U * nfss->retrans_timeo / HZ);
> 	seq_printf(m, ",retrans=%u", nfss->retrans_count);
> }
>-- 
>1.5.2.1
>

Actions: View | Diff

Attachments on bug 171712: 120611 | 159643 | 159776 | 197391