|
@@ -2878,9 +2878,20 @@ nfsd4_encode_lock_denied(struct xdr_stream *xdr, struct nfsd4_lock_denied *ld)
|
|
|
struct xdr_netobj *conf = &ld->ld_owner;
|
|
|
__be32 *p;
|
|
|
|
|
|
+again:
|
|
|
p = xdr_reserve_space(xdr, 32 + XDR_LEN(conf->len));
|
|
|
- if (!p)
|
|
|
+ if (!p) {
|
|
|
+ /*
|
|
|
+ * Don't fail to return the result just because we can't
|
|
|
+ * return the conflicting open:
|
|
|
+ */
|
|
|
+ if (conf->len) {
|
|
|
+ conf->len = 0;
|
|
|
+ conf->data = NULL;
|
|
|
+ goto again;
|
|
|
+ }
|
|
|
return nfserr_resource;
|
|
|
+ }
|
|
|
WRITE64(ld->ld_start);
|
|
|
WRITE64(ld->ld_length);
|
|
|
WRITE32(ld->ld_type);
|
|
@@ -2888,7 +2899,6 @@ nfsd4_encode_lock_denied(struct xdr_stream *xdr, struct nfsd4_lock_denied *ld)
|
|
|
WRITEMEM(&ld->ld_clientid, 8);
|
|
|
WRITE32(conf->len);
|
|
|
WRITEMEM(conf->data, conf->len);
|
|
|
- kfree(conf->data);
|
|
|
} else { /* non - nfsv4 lock in conflict, no clientid nor owner */
|
|
|
WRITE64((u64)0); /* clientid */
|
|
|
WRITE32(0); /* length of owner name */
|
|
@@ -2905,7 +2915,7 @@ nfsd4_encode_lock(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_lo
|
|
|
nfserr = nfsd4_encode_stateid(xdr, &lock->lk_resp_stateid);
|
|
|
else if (nfserr == nfserr_denied)
|
|
|
nfserr = nfsd4_encode_lock_denied(xdr, &lock->lk_denied);
|
|
|
-
|
|
|
+ kfree(lock->lk_denied.ld_owner.data);
|
|
|
return nfserr;
|
|
|
}
|
|
|
|