Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 142154
b: refs/heads/master
c: 819a8f5
h: refs/heads/master
v: v3
  • Loading branch information
J. Bruce Fields committed Mar 18, 2009
1 parent 0f6c91b commit 7e0b031
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fd03b09906c32aea7b47f1275c9cd6034141159d
refs/heads/master: 819a8f539acf7838d62fec20e88401ff53303cd1
11 changes: 2 additions & 9 deletions trunk/fs/nfsd/nfs4state.c
Original file line number Diff line number Diff line change
Expand Up @@ -2059,9 +2059,6 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl
struct inode *ino = current_fh->fh_dentry->d_inode;
__be32 status;

dprintk("NFSD: preprocess_stateid_op: stateid = (%08x/%08x/%08x/%08x)\n",
stateid->si_boot, stateid->si_stateownerid,
stateid->si_fileid, stateid->si_generation);
if (filpp)
*filpp = NULL;

Expand All @@ -2078,10 +2075,8 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl
status = nfserr_bad_stateid;
if (!stateid->si_fileid) { /* delegation stateid */
dp = find_delegation_stateid(ino, stateid);
if (!dp) {
dprintk("NFSD: delegation stateid not found\n");
if (!dp)
goto out;
}
status = check_stateid_generation(stateid, &dp->dl_stateid);
if (status)
goto out;
Expand All @@ -2095,10 +2090,8 @@ nfs4_preprocess_stateid_op(struct svc_fh *current_fh, stateid_t *stateid, int fl
*filpp = dp->dl_vfs_file;
} else { /* open or lock stateid */
stp = find_stateid(stateid, flags);
if (!stp) {
dprintk("NFSD: open or lock stateid not found\n");
if (!stp)
goto out;
}
if ((flags & CHECK_FH) && nfs4_check_fh(current_fh, stp))
goto out;
if (!stp->st_stateowner->so_confirmed)
Expand Down

0 comments on commit 7e0b031

Please sign in to comment.