niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Trond Myklebust 2017-08-01 07:32:50 -04:00
parent 9c760d1fd5
commit 937e3133cd
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
fs/nfs/nfs4proc.c
View file

@ -7319,7 +7319,9 @@ static int nfs4_sp4_select_mode(struct nfs_client *clp,
1 << (OP_DESTROY_SESSION - 32) | 1 << (OP_DESTROY_SESSION - 32) |
1 << (OP_DESTROY_CLIENTID - 32) 1 << (OP_DESTROY_CLIENTID - 32)
}; };
unsigned long flags = 0;
unsigned int i; unsigned int i;
int ret = 0;
if (sp->how == SP4_MACH_CRED) { if (sp->how == SP4_MACH_CRED) {
/* Print state protect result */ /* 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++) { for (i = 0; i < NFS4_OP_MAP_NUM_WORDS; i++) {
if (sp->enforce.u.words[i] & ~supported_enforce[i]) { if (sp->enforce.u.words[i] & ~supported_enforce[i]) {
dfprintk(MOUNT, "sp4_mach_cred: disabled\n"); 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)) { test_bit(OP_DESTROY_CLIENTID, sp->enforce.u.longs)) {
dfprintk(MOUNT, "sp4_mach_cred:\n"); dfprintk(MOUNT, "sp4_mach_cred:\n");
dfprintk(MOUNT, " minimal mode enabled\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 { } else {
dfprintk(MOUNT, "sp4_mach_cred: disabled\n"); dfprintk(MOUNT, "sp4_mach_cred: disabled\n");
return -EINVAL; ret = -EINVAL;
goto out;
} }
if (test_bit(OP_CLOSE, sp->allow.u.longs) && 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_DELEGRETURN, sp->allow.u.longs) &&
test_bit(OP_LOCKU, sp->allow.u.longs)) { test_bit(OP_LOCKU, sp->allow.u.longs)) {
dfprintk(MOUNT, " cleanup mode enabled\n"); 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)) { if (test_bit(OP_LAYOUTRETURN, sp->allow.u.longs)) {
dfprintk(MOUNT, " pnfs cleanup mode enabled\n"); dfprintk(MOUNT, " pnfs cleanup mode enabled\n");
set_bit(NFS_SP4_MACH_CRED_PNFS_CLEANUP, __set_bit(NFS_SP4_MACH_CRED_PNFS_CLEANUP, &flags);
&clp->cl_sp4_flags);
} }
if (test_bit(OP_SECINFO, sp->allow.u.longs) && if (test_bit(OP_SECINFO, sp->allow.u.longs) &&
test_bit(OP_SECINFO_NO_NAME, sp->allow.u.longs)) { test_bit(OP_SECINFO_NO_NAME, sp->allow.u.longs)) {
dfprintk(MOUNT, " secinfo mode enabled\n"); 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) && if (test_bit(OP_TEST_STATEID, sp->allow.u.longs) &&
test_bit(OP_FREE_STATEID, sp->allow.u.longs)) { test_bit(OP_FREE_STATEID, sp->allow.u.longs)) {
dfprintk(MOUNT, " stateid mode enabled\n"); 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)) { if (test_bit(OP_WRITE, sp->allow.u.longs)) {
dfprintk(MOUNT, " write mode enabled\n"); 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)) { if (test_bit(OP_COMMIT, sp->allow.u.longs)) {
dfprintk(MOUNT, " commit mode enabled\n"); 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; return 0;
} }