forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nfs4.1: Add SP4_MACH_CRED cleanup support

Browse source 
CLOSE and LOCKU can use the machine credential.

Signed-off-by: Weston Andros Adamson <dros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Weston Andros Adamson 2013-08-13 16:37:34 -04:00 • committed by Trond Myklebust
commit fa940720ce
2 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
fs/nfs/nfs4proc.c
View file

@ -2615,6 +2615,9 @@ int nfs4_do_close(struct nfs4_state *state, gfp_t gfp_mask, int wait)
}; };
int status = -ENOMEM; int status = -ENOMEM;
nfs4_state_protect(server->nfs_client, NFS_SP4_MACH_CRED_CLEANUP,
&task_setup_data.rpc_client, &msg);
calldata = kzalloc(sizeof(*calldata), gfp_mask); calldata = kzalloc(sizeof(*calldata), gfp_mask);
if (calldata == NULL) if (calldata == NULL)
goto out; goto out;
@ -5230,6 +5233,9 @@ static struct rpc_task *nfs4_do_unlck(struct file_lock *fl,
.flags = RPC_TASK_ASYNC, .flags = RPC_TASK_ASYNC,
}; };
nfs4_state_protect(NFS_SERVER(lsp->ls_state->inode)->nfs_client,
NFS_SP4_MACH_CRED_CLEANUP, &task_setup_data.rpc_client, &msg);
/* Ensure this is an unlock - when canceling a lock, the /* Ensure this is an unlock - when canceling a lock, the
* canceled lock is passed in, and it won't be an unlock. * canceled lock is passed in, and it won't be an unlock.
*/ */
@ -6117,7 +6123,8 @@ out:
} }
/* /*
* Minimum set of SP4_MACH_CRED operations from RFC 5661 * Minimum set of SP4_MACH_CRED operations from RFC 5661 in the enforce map
* and operations we'd like to see to enable certain features in the allow map
*/ */
static const struct nfs41_state_protection nfs4_sp4_mach_cred_request = { static const struct nfs41_state_protection nfs4_sp4_mach_cred_request = {
.how = SP4_MACH_CRED, .how = SP4_MACH_CRED,
@ -6127,6 +6134,10 @@ static const struct nfs41_state_protection nfs4_sp4_mach_cred_request = {
1 << (OP_CREATE_SESSION - 32) | 1 << (OP_CREATE_SESSION - 32) |
1 << (OP_DESTROY_SESSION - 32) | 1 << (OP_DESTROY_SESSION - 32) |
1 << (OP_DESTROY_CLIENTID - 32) 1 << (OP_DESTROY_CLIENTID - 32)
},
.allow.u.words = {
[0] = 1 << (OP_CLOSE) |
1 << (OP_LOCKU)
} }
}; };
@ -6186,6 +6197,12 @@ static int nfs4_sp4_select_mode(struct nfs_client *clp,
dfprintk(MOUNT, "sp4_mach_cred: disabled\n"); dfprintk(MOUNT, "sp4_mach_cred: disabled\n");
return -EINVAL; return -EINVAL;
} }
if (test_bit(OP_CLOSE, 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);
}
} }
return 0; return 0;

1
include/linux/nfs_fs_sb.h
View file

@ -94,6 +94,7 @@ struct nfs_client {
unsigned long cl_sp4_flags; unsigned long cl_sp4_flags;
#define NFS_SP4_MACH_CRED_MINIMAL 1 /* Minimal sp4_mach_cred - state ops #define NFS_SP4_MACH_CRED_MINIMAL 1 /* Minimal sp4_mach_cred - state ops
* must use machine cred */ * must use machine cred */
#define NFS_SP4_MACH_CRED_CLEANUP 2 /* CLOSE and LOCKU */
#endif /* CONFIG_NFS_V4 */ #endif /* CONFIG_NFS_V4 */
#ifdef CONFIG_NFS_FSCACHE #ifdef CONFIG_NFS_FSCACHE