diff options
author | J. Bruce Fields <bfields@redhat.com> | 2011-08-24 12:45:03 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2011-08-31 17:56:03 -0400 |
commit | 9072d5c66b17292e3cd055bc8057b2ce6af2fe34 (patch) | |
tree | 1a043fb220698cd67f24ab47f7734210449cc65c /fs/nfsd/nfs4xdr.c | |
parent | f3e4223751392b9bc0195a806a6e99b4cc399ac0 (diff) |
nfsd4: cleanup seqid op stateowner usage
Now that the replay owner is in the cstate we can remove it from a lot
of other individual operations and further simplify
nfs4_preprocess_seqid_op().
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4xdr.c')
-rw-r--r-- | fs/nfsd/nfs4xdr.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index ee1267838719..462c6eff8471 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c | |||
@@ -456,7 +456,6 @@ nfsd4_decode_close(struct nfsd4_compoundargs *argp, struct nfsd4_close *close) | |||
456 | { | 456 | { |
457 | DECODE_HEAD; | 457 | DECODE_HEAD; |
458 | 458 | ||
459 | close->cl_stateowner = NULL; | ||
460 | READ_BUF(4); | 459 | READ_BUF(4); |
461 | READ32(close->cl_seqid); | 460 | READ32(close->cl_seqid); |
462 | return nfsd4_decode_stateid(argp, &close->cl_stateid); | 461 | return nfsd4_decode_stateid(argp, &close->cl_stateid); |
@@ -551,7 +550,6 @@ nfsd4_decode_lock(struct nfsd4_compoundargs *argp, struct nfsd4_lock *lock) | |||
551 | { | 550 | { |
552 | DECODE_HEAD; | 551 | DECODE_HEAD; |
553 | 552 | ||
554 | lock->lk_replay_owner = NULL; | ||
555 | /* | 553 | /* |
556 | * type, reclaim(boolean), offset, length, new_lock_owner(boolean) | 554 | * type, reclaim(boolean), offset, length, new_lock_owner(boolean) |
557 | */ | 555 | */ |
@@ -611,7 +609,6 @@ nfsd4_decode_locku(struct nfsd4_compoundargs *argp, struct nfsd4_locku *locku) | |||
611 | { | 609 | { |
612 | DECODE_HEAD; | 610 | DECODE_HEAD; |
613 | 611 | ||
614 | locku->lu_stateowner = NULL; | ||
615 | READ_BUF(8); | 612 | READ_BUF(8); |
616 | READ32(locku->lu_type); | 613 | READ32(locku->lu_type); |
617 | if ((locku->lu_type < NFS4_READ_LT) || (locku->lu_type > NFS4_WRITEW_LT)) | 614 | if ((locku->lu_type < NFS4_READ_LT) || (locku->lu_type > NFS4_WRITEW_LT)) |
@@ -739,7 +736,6 @@ nfsd4_decode_open_confirm(struct nfsd4_compoundargs *argp, struct nfsd4_open_con | |||
739 | { | 736 | { |
740 | DECODE_HEAD; | 737 | DECODE_HEAD; |
741 | 738 | ||
742 | open_conf->oc_stateowner = NULL; | ||
743 | status = nfsd4_decode_stateid(argp, &open_conf->oc_req_stateid); | 739 | status = nfsd4_decode_stateid(argp, &open_conf->oc_req_stateid); |
744 | if (status) | 740 | if (status) |
745 | return status; | 741 | return status; |
@@ -754,7 +750,6 @@ nfsd4_decode_open_downgrade(struct nfsd4_compoundargs *argp, struct nfsd4_open_d | |||
754 | { | 750 | { |
755 | DECODE_HEAD; | 751 | DECODE_HEAD; |
756 | 752 | ||
757 | open_down->od_stateowner = NULL; | ||
758 | status = nfsd4_decode_stateid(argp, &open_down->od_stateid); | 753 | status = nfsd4_decode_stateid(argp, &open_down->od_stateid); |
759 | if (status) | 754 | if (status) |
760 | return status; | 755 | return status; |