diff options
Diffstat (limited to 'fs/nfsd/nfs4xdr.c')
-rw-r--r-- | fs/nfsd/nfs4xdr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index dcd673186944..6b743327686c 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c | |||
@@ -528,7 +528,7 @@ nfsd4_decode_lock(struct nfsd4_compoundargs *argp, struct nfsd4_lock *lock) | |||
528 | { | 528 | { |
529 | DECODE_HEAD; | 529 | DECODE_HEAD; |
530 | 530 | ||
531 | lock->lk_stateowner = NULL; | 531 | lock->lk_replay_owner = NULL; |
532 | /* | 532 | /* |
533 | * type, reclaim(boolean), offset, length, new_lock_owner(boolean) | 533 | * type, reclaim(boolean), offset, length, new_lock_owner(boolean) |
534 | */ | 534 | */ |
@@ -1895,7 +1895,6 @@ nfsd4_encode_lock_denied(struct nfsd4_compoundres *resp, struct nfsd4_lock_denie | |||
1895 | static void | 1895 | static void |
1896 | nfsd4_encode_lock(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_lock *lock) | 1896 | nfsd4_encode_lock(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_lock *lock) |
1897 | { | 1897 | { |
1898 | |||
1899 | ENCODE_SEQID_OP_HEAD; | 1898 | ENCODE_SEQID_OP_HEAD; |
1900 | 1899 | ||
1901 | if (!nfserr) { | 1900 | if (!nfserr) { |
@@ -1906,7 +1905,7 @@ nfsd4_encode_lock(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_lock | |||
1906 | } else if (nfserr == nfserr_denied) | 1905 | } else if (nfserr == nfserr_denied) |
1907 | nfsd4_encode_lock_denied(resp, &lock->lk_denied); | 1906 | nfsd4_encode_lock_denied(resp, &lock->lk_denied); |
1908 | 1907 | ||
1909 | ENCODE_SEQID_OP_TAIL(lock->lk_stateowner); | 1908 | ENCODE_SEQID_OP_TAIL(lock->lk_replay_owner); |
1910 | } | 1909 | } |
1911 | 1910 | ||
1912 | static void | 1911 | static void |