NFS: Show most mount options via nfs_show_options() (82d101d5) · Commits · 戴 / test

fs/nfs/super.c

+65 −2

Original line number	Diff line number	Diff line
		@@ -441,10 +441,52 @@ static const char *nfs_pseudoflavour_to_name(rpc_authflavor_t flavour)
		return sec_flavours[i].str;
		}

		static void nfs_show_mountd_options(struct seq_file m, struct nfs_server nfss,
		int showdefaults)
		{
		struct sockaddr sap = (struct sockaddr )&nfss->mountd_address;

		switch (sap->sa_family) {
		case AF_INET: {
		struct sockaddr_in sin = (struct sockaddr_in )sap;
		seq_printf(m, ",mountaddr=" NIPQUAD_FMT,
		NIPQUAD(sin->sin_addr.s_addr));
		break;
		}
		case AF_INET6: {
		struct sockaddr_in6 sin6 = (struct sockaddr_in6 )sap;
		seq_printf(m, ",mountaddr=" NIP6_FMT,
		NIP6(sin6->sin6_addr));
		break;
		}
		default:
		if (showdefaults)
		seq_printf(m, ",mountaddr=unspecified");
		}

		if (nfss->mountd_version \|\| showdefaults)
		seq_printf(m, ",mountvers=%u", nfss->mountd_version);
		if (nfss->mountd_port \|\| showdefaults)
		seq_printf(m, ",mountport=%u", nfss->mountd_port);

		switch (nfss->mountd_protocol) {
		case IPPROTO_UDP:
		seq_printf(m, ",mountproto=udp");
		break;
		case IPPROTO_TCP:
		seq_printf(m, ",mountproto=tcp");
		break;
		default:
		if (showdefaults)
		seq_printf(m, ",mountproto=auto");
		}
		}

		/*
		* Describe the mount options in force on this server representation
		*/
		static void nfs_show_mount_options(struct seq_file m, struct nfs_server nfss, int showdefaults)
		static void nfs_show_mount_options(struct seq_file m, struct nfs_server nfss,
		int showdefaults)
		{
		static const struct proc_nfs_info {
		int flag;
		@@ -452,6 +494,8 @@ static void nfs_show_mount_options(struct seq_file m, struct nfs_server nfss,
		const char *nostr;
		} nfs_info[] = {
		{ NFS_MOUNT_SOFT, ",soft", ",hard" },
		{ NFS_MOUNT_INTR, ",intr", ",nointr" },
		{ NFS_MOUNT_POSIX, ",posix", "" },
		{ NFS_MOUNT_NOCTO, ",nocto", "" },
		{ NFS_MOUNT_NOAC, ",noac", "" },
		{ NFS_MOUNT_NONLM, ",nolock", "" },
		@@ -462,10 +506,14 @@ static void nfs_show_mount_options(struct seq_file m, struct nfs_server nfss,
		};
		const struct proc_nfs_info *nfs_infop;
		struct nfs_client *clp = nfss->nfs_client;
		u32 version = clp->rpc_ops->version;

		seq_printf(m, ",vers=%u", clp->rpc_ops->version);
		seq_printf(m, ",vers=%u", version);
		seq_printf(m, ",rsize=%u", nfss->rsize);
		seq_printf(m, ",wsize=%u", nfss->wsize);
		if (nfss->bsize != 0)
		seq_printf(m, ",bsize=%u", nfss->bsize);
		seq_printf(m, ",namlen=%u", nfss->namelen);
		if (nfss->acregmin != 3*HZ \|\| showdefaults)
		seq_printf(m, ",acregmin=%u", nfss->acregmin/HZ);
		if (nfss->acregmax != 60*HZ \|\| showdefaults)
		@@ -482,9 +530,24 @@ static void nfs_show_mount_options(struct seq_file m, struct nfs_server nfss,
		}
		seq_printf(m, ",proto=%s",
		rpc_peeraddr2str(nfss->client, RPC_DISPLAY_PROTO));
		if (version == 4) {
		if (nfss->port != NFS_PORT)
		seq_printf(m, ",port=%u", nfss->port);
		} else
		if (nfss->port)
		seq_printf(m, ",port=%u", nfss->port);

		seq_printf(m, ",timeo=%lu", 10U * nfss->client->cl_timeout->to_initval / HZ);
		seq_printf(m, ",retrans=%u", nfss->client->cl_timeout->to_retries);
		seq_printf(m, ",sec=%s", nfs_pseudoflavour_to_name(nfss->client->cl_auth->au_flavor));

		if (version != 4)
		nfs_show_mountd_options(m, nfss, showdefaults);

		#ifdef CONFIG_NFS_V4
		if (clp->rpc_ops->version == 4)
		seq_printf(m, ",clientaddr=%s", clp->cl_ipaddr);
		#endif
		}

		/*

Admin message