NFSD: fix nfsd_reset_versions for NFSv4. (800a938f) · Commits · 戴 / test

If you write "-2 -3 -4" to the "versions" file, it will notice that no versions are enabled, and nfsd_reset_versions() is called. This enables all major versions, not no minor versions. So we lose the invariant that NFSv4 is only advertised when at least one minor is enabled. Fix the code to explicitly enable minor versions for v4, change it to use nfsd_vers() to test and set, and simplify the code. Signed-off-by:

NeilBrown <neilb@suse.com> Signed-off-by:

J. Bruce Fields <bfields@redhat.com>

fs/nfsd/nfssvc.c

+11 −14

Original line number	Diff line number	Diff line
		@@ -416,22 +416,19 @@ static void nfsd_last_thread(struct svc_serv serv, struct net net)

		void nfsd_reset_versions(void)
		{
		int found_one = 0;
		int i;

		for (i = NFSD_MINVERS; i < NFSD_NRVERS; i++) {
		if (nfsd_program.pg_vers[i])
		found_one = 1;
		}
		for (i = 0; i < NFSD_NRVERS; i++)
		if (nfsd_vers(i, NFSD_TEST))
		return;

		if (!found_one) {
		for (i = NFSD_MINVERS; i < NFSD_NRVERS; i++)
		nfsd_program.pg_vers[i] = nfsd_version[i];
		#if defined(CONFIG_NFSD_V2_ACL) \|\| defined(CONFIG_NFSD_V3_ACL)
		for (i = NFSD_ACL_MINVERS; i < NFSD_ACL_NRVERS; i++)
		nfsd_acl_program.pg_vers[i] =
		nfsd_acl_version[i];
		#endif
		for (i = 0; i < NFSD_NRVERS; i++)
		if (i != 4)
		nfsd_vers(i, NFSD_SET);
		else {
		int minor = 0;
		while (nfsd_minorversion(minor, NFSD_SET) >= 0)
		minor++;
		}
		}

Admin message