Attachment 159643 Details for Bug 171712 – upstream kernel patch -- show correct options for nfsv4

[patch] upstream kernel patch -- show correct options for nfsv4

linux-2.6-nfsv4-mount-proto.patch (text/plain), 1.52 KB, created by Jeff Layton on 2007-07-20 11:36:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2007-07-20 11:36:40 UTC

Size: 1.52 KB

patch

obsolete

>commit 3063d8a16643190f9e12e9c7e9f1ca56f7e7934e
>Author: Trond Myklebust <Trond.Myklebust@netapp.com>
>Date:   Thu Aug 25 16:25:57 2005 -0700
>
>    NFS: Make /proc/mounts display the protocol used by NFSv4
>    
>     Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
>
>diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
>index 062911e..358d8ef 100644
>--- a/fs/nfs/inode.c
>+++ b/fs/nfs/inode.c
>@@ -595,7 +595,6 @@ static int nfs_show_options(struct seq_file *m, struct vfsmount *mnt)
> 		{ 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" },
>@@ -604,6 +603,8 @@ static int nfs_show_options(struct seq_file *m, struct vfsmount *mnt)
> 	};
> 	struct proc_nfs_info *nfs_infop;
> 	struct nfs_server *nfss = NFS_SB(mnt->mnt_sb);
>+	char buf[12];
>+	char *proto;
> 
> 	seq_printf(m, ",v%d", nfss->rpc_ops->version);
> 	seq_printf(m, ",rsize=%d", nfss->rsize);
>@@ -622,6 +623,18 @@ static int nfs_show_options(struct seq_file *m, struct vfsmount *mnt)
> 		else
> 			seq_puts(m, nfs_infop->nostr);
> 	}
>+	switch (nfss->client->cl_xprt->prot) {
>+		case IPPROTO_TCP:
>+			proto = "tcp";
>+			break;
>+		case IPPROTO_UDP:
>+			proto = "udp";
>+			break;
>+		default:
>+			snprintf(buf, sizeof(buf), "%u", nfss->client->cl_xprt->prot);
>+			proto = buf;
>+	}
>+	seq_printf(m, ",proto=%s", proto);
> 	seq_puts(m, ",addr=");
> 	seq_escape(m, nfss->hostname, " \t\n\\");
> 	return 0;

Actions: View | Diff

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