lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] nfsd4: add open state code for CLAIM_DELEGATE_CUR

Browse Source 
State logic for OPEN with claim type CLAIM_DELEGATE_CUR, which the NFSv4
client uses to report local OPENs on a delegated file back to the NFSv4
server.

nfs4_check_deleg() performs input delegation stateid lookup and sanity check.

Signed-off-by: Andy Adamson <andros@citi.umich.edu>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
NeilBrown
2005-06-23 22:02:54 -07:00
committed by Linus Torvalds
parent 567d98292e
commit c44c5eeb2c
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
fs/nfsd/nfs4state.c
View File

@@ -1547,22 +1547,28 @@ find_delegation_file(struct nfs4_file *fp, stateid_t *stid)
return NULL; return NULL;
} }
static void static int
nfs4_check_deleg(struct nfs4_file *fp, struct nfsd4_open *open, nfs4_check_deleg(struct nfs4_file *fp, struct nfsd4_open *open,
struct nfs4_delegation **dp) struct nfs4_delegation **dp)
{ {
int flags; int flags;
int status; int status = nfserr_bad_stateid;
*dp = find_delegation_file(fp, &open->op_delegate_stateid); *dp = find_delegation_file(fp, &open->op_delegate_stateid);
if (*dp == NULL) if (*dp == NULL)
return; goto out;
flags = open->op_share_access == NFS4_SHARE_ACCESS_READ ? flags = open->op_share_access == NFS4_SHARE_ACCESS_READ ?
RD_STATE : WR_STATE; RD_STATE : WR_STATE;
status = nfs4_check_delegmode(*dp, flags); status = nfs4_check_delegmode(*dp, flags);
if (status) if (status)
*dp = NULL; *dp = NULL;
return; out:
if (open->op_claim_type != NFS4_OPEN_CLAIM_DELEGATE_CUR)
return nfs_ok;
if (status)
return status;
open->op_stateowner->so_confirmed = 1;
return nfs_ok;
} }
static int static int
@@ -1760,8 +1766,13 @@ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nf
if (fp) { if (fp) {
if ((status = nfs4_check_open(fp, open, &stp))) if ((status = nfs4_check_open(fp, open, &stp)))
goto out; goto out;
nfs4_check_deleg(fp, open, &dp); status = nfs4_check_deleg(fp, open, &dp);
if (status)
goto out;
} else { } else {
status = nfserr_bad_stateid;
if (open->op_claim_type == NFS4_OPEN_CLAIM_DELEGATE_CUR)
goto out;
status = nfserr_resource; status = nfserr_resource;
fp = alloc_init_file(ino); fp = alloc_init_file(ino);
if (fp == NULL) if (fp == NULL)