iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFSv4: Support recalling delegations by stateid part 2

Browse Source 
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2007-07-06 15:10:43 -04:00
parent 9016302784
commit 13437e12fb
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/delegation.c
View File

@ -76,7 +76,7 @@ again:
continue; continue;
get_nfs_open_context(ctx); get_nfs_open_context(ctx);
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
err = nfs4_open_delegation_recall(ctx, state); err = nfs4_open_delegation_recall(ctx, state, stateid);
if (err >= 0) if (err >= 0)
err = nfs_delegation_claim_locks(ctx, state); err = nfs_delegation_claim_locks(ctx, state);
put_nfs_open_context(ctx); put_nfs_open_context(ctx);

2
fs/nfs/delegation.h
View File

@ -39,7 +39,7 @@ void nfs_delegation_reap_unclaimed(struct nfs_client *clp);
/* NFSv4 delegation-related procedures */ /* NFSv4 delegation-related procedures */
int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid); int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid);
int nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state *state); int nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state *state, const nfs4_stateid *stateid);
int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl); int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl);
int nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode); int nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode);

10
fs/nfs/nfs4proc.c
View File

@ -510,32 +510,30 @@ static int nfs4_open_reclaim(struct nfs4_state_owner *sp, struct nfs4_state *sta
return ret; return ret;
} }
static int _nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state *state) static int _nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state *state, const nfs4_stateid *stateid)
{ {
struct nfs4_state_owner *sp = state->owner; struct nfs4_state_owner *sp = state->owner;
struct nfs4_opendata *opendata; struct nfs4_opendata *opendata;
int ret; int ret;
if (!test_bit(NFS_DELEGATED_STATE, &state->flags))
return 0;
opendata = nfs4_opendata_alloc(&ctx->path, sp, 0, NULL); opendata = nfs4_opendata_alloc(&ctx->path, sp, 0, NULL);
if (opendata == NULL) if (opendata == NULL)
return -ENOMEM; return -ENOMEM;
opendata->o_arg.claim = NFS4_OPEN_CLAIM_DELEGATE_CUR; opendata->o_arg.claim = NFS4_OPEN_CLAIM_DELEGATE_CUR;
memcpy(opendata->o_arg.u.delegation.data, state->stateid.data, memcpy(opendata->o_arg.u.delegation.data, stateid->data,
sizeof(opendata->o_arg.u.delegation.data)); sizeof(opendata->o_arg.u.delegation.data));
ret = nfs4_open_recover(opendata, state); ret = nfs4_open_recover(opendata, state);
nfs4_opendata_put(opendata); nfs4_opendata_put(opendata);
return ret; return ret;
} }
int nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state *state) int nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state *state, const nfs4_stateid *stateid)
{ {
struct nfs4_exception exception = { }; struct nfs4_exception exception = { };
struct nfs_server *server = NFS_SERVER(state->inode); struct nfs_server *server = NFS_SERVER(state->inode);
int err; int err;
do { do {
err = _nfs4_open_delegation_recall(ctx, state); err = _nfs4_open_delegation_recall(ctx, state, stateid);
switch (err) { switch (err) {
case 0: case 0:
return err; return err;