Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

NFS: Make /proc/mounts display the protocol used by NFSv4

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

+14 -1
+14 -1
fs/nfs/inode.c
··· 595 595 { NFS_MOUNT_SOFT, ",soft", ",hard" }, 596 596 { NFS_MOUNT_INTR, ",intr", "" }, 597 597 { NFS_MOUNT_POSIX, ",posix", "" }, 598 - { NFS_MOUNT_TCP, ",tcp", ",udp" }, 599 598 { NFS_MOUNT_NOCTO, ",nocto", "" }, 600 599 { NFS_MOUNT_NOAC, ",noac", "" }, 601 600 { NFS_MOUNT_NONLM, ",nolock", ",lock" }, ··· 603 604 }; 604 605 struct proc_nfs_info *nfs_infop; 605 606 struct nfs_server *nfss = NFS_SB(mnt->mnt_sb); 607 + char buf[12]; 608 + char *proto; 606 609 607 610 seq_printf(m, ",v%d", nfss->rpc_ops->version); 608 611 seq_printf(m, ",rsize=%d", nfss->rsize); ··· 623 622 else 624 623 seq_puts(m, nfs_infop->nostr); 625 624 } 625 + switch (nfss->client->cl_xprt->prot) { 626 + case IPPROTO_TCP: 627 + proto = "tcp"; 628 + break; 629 + case IPPROTO_UDP: 630 + proto = "udp"; 631 + break; 632 + default: 633 + snprintf(buf, sizeof(buf), "%u", nfss->client->cl_xprt->prot); 634 + proto = buf; 635 + } 636 + seq_printf(m, ",proto=%s", proto); 626 637 seq_puts(m, ",addr="); 627 638 seq_escape(m, nfss->hostname, " \t\n\\"); 628 639 return 0;