Commit 937e3133 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1: Ensure we clear the SP4_MACH_CRED flags in nfs4_sp4_select_mode() 



If the server changes, so that it no longer supports SP4_MACH_CRED, or
that it doesn't support the same set of SP4_MACH_CRED functionality,
then we want to ensure that we clear the unsupported flags.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 9c760d1f

fs/nfs/nfs4proc.c

+15 −11
Original line number Diff line number Diff line
@@ -7319,7 +7319,9 @@ static int nfs4_sp4_select_mode(struct nfs_client *clp, 
		      1 << (OP_DESTROY_SESSION - 32) |

		      1 << (OP_DESTROY_CLIENTID - 32)

	};

	unsigned long flags = 0;

	unsigned int i;

	int ret = 0;



	if (sp->how == SP4_MACH_CRED) {

		/* Print state protect result */
@@ -7335,7 +7337,8 @@ static int nfs4_sp4_select_mode(struct nfs_client *clp, 
		for (i = 0; i < NFS4_OP_MAP_NUM_WORDS; i++) {

			if (sp->enforce.u.words[i] & ~supported_enforce[i]) {

				dfprintk(MOUNT, "sp4_mach_cred: disabled\n");

				return -EINVAL;

				ret = -EINVAL;

				goto out;

			}

		}
@@ -7354,10 +7357,11 @@ static int nfs4_sp4_select_mode(struct nfs_client *clp, 
		    test_bit(OP_DESTROY_CLIENTID, sp->enforce.u.longs)) {

			dfprintk(MOUNT, "sp4_mach_cred:\n");

			dfprintk(MOUNT, "  minimal mode enabled\n");

			set_bit(NFS_SP4_MACH_CRED_MINIMAL, &clp->cl_sp4_flags);

			__set_bit(NFS_SP4_MACH_CRED_MINIMAL, &flags);

		} else {

			dfprintk(MOUNT, "sp4_mach_cred: disabled\n");

			return -EINVAL;

			ret = -EINVAL;

			goto out;

		}



		if (test_bit(OP_CLOSE, sp->allow.u.longs) &&
@@ -7365,38 +7369,38 @@ static int nfs4_sp4_select_mode(struct nfs_client *clp, 
		    test_bit(OP_DELEGRETURN, sp->allow.u.longs) &&

		    test_bit(OP_LOCKU, sp->allow.u.longs)) {

			dfprintk(MOUNT, "  cleanup mode enabled\n");

			set_bit(NFS_SP4_MACH_CRED_CLEANUP, &clp->cl_sp4_flags);

			__set_bit(NFS_SP4_MACH_CRED_CLEANUP, &flags);

		}



		if (test_bit(OP_LAYOUTRETURN, sp->allow.u.longs)) {

			dfprintk(MOUNT, "  pnfs cleanup mode enabled\n");

			set_bit(NFS_SP4_MACH_CRED_PNFS_CLEANUP,

				&clp->cl_sp4_flags);

			__set_bit(NFS_SP4_MACH_CRED_PNFS_CLEANUP, &flags);

		}



		if (test_bit(OP_SECINFO, sp->allow.u.longs) &&

		    test_bit(OP_SECINFO_NO_NAME, sp->allow.u.longs)) {

			dfprintk(MOUNT, "  secinfo mode enabled\n");

			set_bit(NFS_SP4_MACH_CRED_SECINFO, &clp->cl_sp4_flags);

			__set_bit(NFS_SP4_MACH_CRED_SECINFO, &flags);

		}



		if (test_bit(OP_TEST_STATEID, sp->allow.u.longs) &&

		    test_bit(OP_FREE_STATEID, sp->allow.u.longs)) {

			dfprintk(MOUNT, "  stateid mode enabled\n");

			set_bit(NFS_SP4_MACH_CRED_STATEID, &clp->cl_sp4_flags);

			__set_bit(NFS_SP4_MACH_CRED_STATEID, &flags);

		}



		if (test_bit(OP_WRITE, sp->allow.u.longs)) {

			dfprintk(MOUNT, "  write mode enabled\n");

			set_bit(NFS_SP4_MACH_CRED_WRITE, &clp->cl_sp4_flags);

			__set_bit(NFS_SP4_MACH_CRED_WRITE, &flags);

		}



		if (test_bit(OP_COMMIT, sp->allow.u.longs)) {

			dfprintk(MOUNT, "  commit mode enabled\n");

			set_bit(NFS_SP4_MACH_CRED_COMMIT, &clp->cl_sp4_flags);

			__set_bit(NFS_SP4_MACH_CRED_COMMIT, &flags);

		}

	}



out:

	clp->cl_sp4_flags = flags;

	return 0;

}